diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:23:37 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:23:37 +0800 |
commit | f9a6038f5b82cad6956c9cbb7f1220d97570632b (patch) | |
tree | 78fb61bed1924b60c3c4d59e5a5a471f55f91de7 /ui | |
parent | 4d0ae8b0cb32e9de63092bc36022ea4af76cad8b (diff) | |
parent | baca0c2251a2587c136999a91449d9b6f7a6c60f (diff) | |
download | dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar.gz dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar.bz2 dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar.lz dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar.xz dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.tar.zst dexon-f9a6038f5b82cad6956c9cbb7f1220d97570632b.zip |
merge
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/qwhisper/whisper.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/qt/qwhisper/whisper.go b/ui/qt/qwhisper/whisper.go index 90ec822aa..bf165bbcc 100644 --- a/ui/qt/qwhisper/whisper.go +++ b/ui/qt/qwhisper/whisper.go @@ -4,8 +4,8 @@ package qwhisper import ( "time" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/whisper" "github.com/obscuren/qml" @@ -13,8 +13,6 @@ import ( var qlogger = logger.NewLogger("QSHH") -func toHex(b []byte) string { return "0x" + common.Bytes2Hex(b) } - type Whisper struct { *whisper.Whisper view qml.Object @@ -66,7 +64,7 @@ func (self *Whisper) Post(payload []string, to, from string, topics []string, pr 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 { |