diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
| commit | e13c6739804604849c7e43d27b073e68fba58191 (patch) | |
| tree | b3471931b63210a4d107875dffd6572bcd96239e /xeth/whisper.go | |
| parent | 965c9babe336cfa8d5c740d5356acbc5f9ba4a72 (diff) | |
| parent | 5f35e6778f10d9e2c6418beff7ed201be80448c4 (diff) | |
| download | go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar.gz go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar.bz2 go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar.lz go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar.xz go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.tar.zst go-tangerine-e13c6739804604849c7e43d27b073e68fba58191.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
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, } } |