diff options
| author | Felix Lange <fjl@twurst.com> | 2017-01-06 23:44:20 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-01-07 01:18:07 +0800 |
| commit | f2da6581ba827a2aab091f764ace8017b26450d8 (patch) | |
| tree | 3bf7ed2ec48812064c5eb6191c9848ad7985561b /whisper/shhapi | |
| parent | 35a7dcb162546f7f31cb6492f716cb93159218d7 (diff) | |
| download | go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.gz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.bz2 go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.lz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.xz go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.tar.zst go-tangerine-f2da6581ba827a2aab091f764ace8017b26450d8.zip | |
all: fix issues reported by honnef.co/go/simple/cmd/gosimple
Diffstat (limited to 'whisper/shhapi')
| -rw-r--r-- | whisper/shhapi/api.go | 6 | ||||
| -rw-r--r-- | whisper/shhapi/api_test.go | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/whisper/shhapi/api.go b/whisper/shhapi/api.go index 24d54b653..379bb90d3 100644 --- a/whisper/shhapi/api.go +++ b/whisper/shhapi/api.go @@ -178,14 +178,10 @@ func (api *PublicWhisperAPI) NewFilter(args WhisperFilterArgs) (uint32, error) { Messages: make(map[common.Hash]*whisperv5.ReceivedMessage), AcceptP2P: args.AcceptP2P, } - if len(filter.KeySym) > 0 { filter.SymKeyHash = crypto.Keccak256Hash(filter.KeySym) } - - for _, t := range args.Topics { - filter.Topics = append(filter.Topics, t) - } + filter.Topics = append(filter.Topics, args.Topics...) if len(args.Topics) == 0 { info := "NewFilter: at least one topic must be specified" diff --git a/whisper/shhapi/api_test.go b/whisper/shhapi/api_test.go index d2890a9a3..60b6fbd04 100644 --- a/whisper/shhapi/api_test.go +++ b/whisper/shhapi/api_test.go @@ -253,7 +253,7 @@ func TestUnmarshalPostArgs(t *testing.T) { if a.FilterID != 64 { t.Fatalf("wrong FilterID: %d.", a.FilterID) } - if bytes.Compare(a.PeerID[:], a.Topic[:]) != 0 { + if !bytes.Equal(a.PeerID[:], a.Topic[:]) { t.Fatalf("wrong PeerID: %x.", a.PeerID) } } |