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 /ui | |
| 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 '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 { |