diff options
author | obscuren <geffobscura@gmail.com> | 2015-04-13 23:35:46 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-04-13 23:35:46 +0800 |
commit | 333e539ce2143e9f416cef45053c1c21ce0312d4 (patch) | |
tree | da21c5ca613615f78e7475f67e743c6d9464d1cb /xeth | |
parent | a8a2b2a488f7433abc09c51b751556875c9107a9 (diff) | |
parent | 1fa844aaf51beae9129b52a52f51b6602c52ccdb (diff) | |
download | go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar.gz go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar.bz2 go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar.lz go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar.xz go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.tar.zst go-tangerine-333e539ce2143e9f416cef45053c1c21ce0312d4.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 72e1ee04f..51caec8d6 100644 --- a/xeth/whisper.go +++ b/xeth/whisper.go @@ -32,8 +32,8 @@ func (self *Whisper) Post(payload string, to, from string, topics []string, prio pk := crypto.ToECDSAPub(common.FromHex(from)) if key := self.Whisper.GetIdentity(pk); key != nil || len(from) == 0 { msg := whisper.NewMessage(common.FromHex(payload)) - envelope, err := msg.Seal(time.Duration(priority*100000), whisper.Opts{ - Ttl: time.Duration(ttl) * time.Second, + envelope, err := msg.Wrap(time.Duration(priority*100000), whisper.Options{ + TTL: time.Duration(ttl) * time.Second, To: crypto.ToECDSAPub(common.FromHex(to)), From: key, Topics: whisper.TopicsFromString(topics...), |