diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-18 08:33:04 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-18 08:33:04 +0800 |
| commit | c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d (patch) | |
| tree | 6d5bea52157c4fa04de8402fe4aaf375b78801df /xeth | |
| parent | 89fd752659c5c11b243c30f739781d723cac82c2 (diff) | |
| parent | 7dc6c338736b05fa239316f5764fb3ffec6ec6c2 (diff) | |
| download | dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.gz dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.bz2 dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.lz dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.xz dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.tar.zst dexon-c39a7b5c0d2002d72df7a0517ccc6edd7557ab7d.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/whisper.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xeth/whisper.go b/xeth/whisper.go index 51caec8d6..342910b5c 100644 --- a/xeth/whisper.go +++ b/xeth/whisper.go @@ -36,7 +36,7 @@ func (self *Whisper) Post(payload string, to, from string, topics []string, prio TTL: time.Duration(ttl) * time.Second, To: crypto.ToECDSAPub(common.FromHex(to)), From: key, - Topics: whisper.TopicsFromString(topics...), + Topics: whisper.NewTopicsFromStrings(topics...), }) if err != nil { @@ -71,7 +71,7 @@ func (self *Whisper) Watch(opts *Options) int { filter := whisper.Filter{ To: crypto.ToECDSAPub(common.FromHex(opts.To)), From: crypto.ToECDSAPub(common.FromHex(opts.From)), - Topics: whisper.TopicsFromString(opts.Topics...), + Topics: whisper.NewTopicsFromStrings(opts.Topics...), } var i int |