diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-09 07:06:24 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-09 07:06:24 +0800 |
| commit | b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e (patch) | |
| tree | ae9f28a4c89ba70b4ee2091aa1b6a564f7a05f48 /whisper | |
| parent | ac695387075fdd9214ef8de71ac6897136a50ce8 (diff) | |
| parent | 16a04e64f23b7a81018c7fcf7626ca6965d9a809 (diff) | |
| download | dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar.gz dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar.bz2 dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar.lz dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar.xz dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.tar.zst dexon-b22f0f2ef51bdb769259b3cf7d9ee0e8e5b0635e.zip | |
merged
Diffstat (limited to 'whisper')
| -rw-r--r-- | whisper/filter.go | 2 | ||||
| -rw-r--r-- | whisper/whisper.go | 2 | ||||
| -rw-r--r-- | whisper/whisper_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/whisper/filter.go b/whisper/filter.go index 4315aa556..b33f2c1a2 100644 --- a/whisper/filter.go +++ b/whisper/filter.go @@ -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) diff --git a/whisper/whisper.go b/whisper/whisper.go index cc0348422..57c898303 100644 --- a/whisper/whisper.go +++ b/whisper/whisper.go @@ -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{}) { diff --git a/whisper/whisper_test.go b/whisper/whisper_test.go index c5ad73021..3e3945a0a 100644 --- a/whisper/whisper_test.go +++ b/whisper/whisper_test.go @@ -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 }, |