whisper: minor refactoring

whisper/whisperv6/api.go

@@ -113,29 +113,17 @@ func (api *PublicWhisperAPI) Info(ctx context.Context) Info {
 // SetMaxMessageSize sets the maximum message size that is accepted.
 // Upper limit is defined by MaxMessageSize.
 func (api *PublicWhisperAPI) SetMaxMessageSize(ctx context.Context, size uint32) (bool, error) {
-	err := api.w.SetMaxMessageSize(size)
+	return true, api.w.SetMaxMessageSize(size)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
 }
 
 // SetMinPow sets the minimum PoW, and notifies the peers.
 func (api *PublicWhisperAPI) SetMinPoW(ctx context.Context, pow float64) (bool, error) {
-	err := api.w.SetMinimumPoW(pow)
+	return true, api.w.SetMinimumPoW(pow)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
 }
 
 // SetBloomFilter sets the new value of bloom filter, and notifies the peers.
 func (api *PublicWhisperAPI) SetBloomFilter(ctx context.Context, bloom hexutil.Bytes) (bool, error) {
-	err := api.w.SetBloomFilter(bloom)
+	return true, api.w.SetBloomFilter(bloom)
-	if err != nil {
-		return false, err
-	}
-	return true, nil
 }
 
 // MarkTrustedPeer marks a peer trusted, which will allow it to send historic (expired) messages.

whisper/whisperv6/peer_test.go

@@ -178,7 +178,7 @@ func initialize(t *testing.T) {
 		node.shh = New(&DefaultConfig)
 		node.shh.SetMinimumPoW(masterPow)
 		node.shh.SetBloomFilter(b)
-		if !isBloomFilterEqual(node.shh.BloomFilter(), masterBloomFilter) {
+		if !bytes.Equal(node.shh.BloomFilter(), masterBloomFilter) {
 			t.Fatalf("bloom mismatch on init.")
 		}
 		node.shh.Start(nil)
@@ -421,7 +421,7 @@ func checkPowExchange(t *testing.T) {
 func checkBloomFilterExchange(t *testing.T) {
 	for i, node := range nodes {
 		for peer := range node.shh.peers {
-			if !isBloomFilterEqual(peer.bloomFilter, masterBloomFilter) {
+			if !bytes.Equal(peer.bloomFilter, masterBloomFilter) {
 				t.Fatalf("node %d: failed to exchange bloom filter requirement in round %d. \n%x expected \n%x got",
 					i, round, masterBloomFilter, peer.bloomFilter)
 			}

whisper/whisperv6/whisper.go

@@ -1067,12 +1067,3 @@ func addBloom(a, b []byte) []byte {
 	}
 	return c
 }
-
-func isBloomFilterEqual(a, b []byte) bool {
-	for i := 0; i < bloomFilterSize; i++ {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}