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 /ui | |
| parent | 965c9babe336cfa8d5c740d5356acbc5f9ba4a72 (diff) | |
| parent | 5f35e6778f10d9e2c6418beff7ed201be80448c4 (diff) | |
| download | dexon-e13c6739804604849c7e43d27b073e68fba58191.tar dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.gz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.bz2 dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.lz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.xz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.zst dexon-e13c6739804604849c7e43d27b073e68fba58191.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
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 { |