diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-18 20:46:55 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-18 20:46:55 +0800 |
| commit | e30c32339132d678b428ae531932a3f048665f59 (patch) | |
| tree | ec68d48217e26aeff8dd96b1d5f8a6abfef95ff7 /xeth/whisper.go | |
| parent | 67c9d9c2fa6d1cb74188dccf7e25422db72983c8 (diff) | |
| parent | 3ea99f989ff98432cbfa864d2e7e26628e16cc6f (diff) | |
| download | go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar.gz go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar.bz2 go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar.lz go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar.xz go-tangerine-e30c32339132d678b428ae531932a3f048665f59.tar.zst go-tangerine-e30c32339132d678b428ae531932a3f048665f59.zip | |
merge develop
Diffstat (limited to 'xeth/whisper.go')
| -rw-r--r-- | xeth/whisper.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xeth/whisper.go b/xeth/whisper.go index c0be4c392..72e1ee04f 100644 --- a/xeth/whisper.go +++ b/xeth/whisper.go @@ -56,7 +56,7 @@ func (self *Whisper) Post(payload string, to, from string, topics []string, prio func (self *Whisper) NewIdentity() string { key := self.Whisper.NewIdentity() - return toHex(crypto.FromECDSAPub(&key.PublicKey)) + return common.ToHex(crypto.FromECDSAPub(&key.PublicKey)) } func (self *Whisper) HasIdentity(key string) bool { @@ -112,9 +112,9 @@ type WhisperMessage struct { func NewWhisperMessage(msg *whisper.Message) WhisperMessage { return WhisperMessage{ ref: msg, - Payload: toHex(msg.Payload), - From: toHex(crypto.FromECDSAPub(msg.Recover())), - To: toHex(crypto.FromECDSAPub(msg.To)), + Payload: common.ToHex(msg.Payload), + From: common.ToHex(crypto.FromECDSAPub(msg.Recover())), + To: common.ToHex(crypto.FromECDSAPub(msg.To)), Sent: msg.Sent, } } |