diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-07 01:30:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 01:30:44 +0800 |
| commit | ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632 (patch) | |
| tree | 2b06aa1b360f1488264058d04e399e84b898f0d8 /whisper/shhapi | |
| parent | 444fc892b0a860218dab3e421d92c33408b9eb6d (diff) | |
| parent | 13e3b2f433c48fe81423c1a13e9a5194ece61b01 (diff) | |
| download | dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.gz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.bz2 dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.lz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.xz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.zst dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.zip | |
Merge pull request #3525 from fjl/all-gosimple-cleanup
all: clean up lint issues, remove more dead code
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) } } |