API changed to use Pubkey only. Reflected that change in the rest of the api
This commit is contained in:
parent
6b5f25802e
commit
e40c1c62ce
@ -29,7 +29,8 @@
|
||||
var web3 = require('web3');
|
||||
var eth = web3.eth;
|
||||
|
||||
web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
|
||||
web3.setProvider(new
|
||||
web3.providers.HttpSyncProvider('http://localhost:8545'));
|
||||
var desc = [{
|
||||
"name": "balance(address)",
|
||||
"type": "function",
|
||||
|
@ -106,7 +106,7 @@ func (self *Whisper) Messages(id int) (messages *ethutil.List) {
|
||||
|
||||
func filterFromMap(opts map[string]interface{}) (f whisper.Filter) {
|
||||
if to, ok := opts["to"].(string); ok {
|
||||
f.To = crypto.ToECDSA(fromHex(to))
|
||||
f.To = crypto.ToECDSAPub(fromHex(to))
|
||||
}
|
||||
if from, ok := opts["from"].(string); ok {
|
||||
f.From = crypto.ToECDSAPub(fromHex(from))
|
||||
|
@ -3,7 +3,7 @@ package whisper
|
||||
import "crypto/ecdsa"
|
||||
|
||||
type Filter struct {
|
||||
To *ecdsa.PrivateKey
|
||||
To *ecdsa.PublicKey
|
||||
From *ecdsa.PublicKey
|
||||
Topics [][]byte
|
||||
Fn func(*Message)
|
||||
|
@ -118,7 +118,7 @@ func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey {
|
||||
|
||||
func (self *Whisper) Watch(opts Filter) int {
|
||||
return self.filters.Install(filter.Generic{
|
||||
Str1: string(crypto.FromECDSA(opts.To)),
|
||||
Str1: string(crypto.FromECDSAPub(opts.To)),
|
||||
Str2: string(crypto.FromECDSAPub(opts.From)),
|
||||
Data: bytesToMap(opts.Topics),
|
||||
Fn: func(data interface{}) {
|
||||
|
@ -11,7 +11,7 @@ func TestEvent(t *testing.T) {
|
||||
whisper := New()
|
||||
id := whisper.NewIdentity()
|
||||
whisper.Watch(Filter{
|
||||
To: id,
|
||||
To: &id.PublicKey,
|
||||
Fn: func(msg *Message) {
|
||||
res <- msg
|
||||
},
|
||||
|
@ -64,7 +64,7 @@ func (self *Whisper) HasIdentity(key string) bool {
|
||||
|
||||
func (self *Whisper) Watch(opts *Options) int {
|
||||
filter := whisper.Filter{
|
||||
To: crypto.ToECDSA(fromHex(opts.To)),
|
||||
To: crypto.ToECDSAPub(fromHex(opts.To)),
|
||||
From: crypto.ToECDSAPub(fromHex(opts.From)),
|
||||
Topics: whisper.TopicsFromString(opts.Topics...),
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user