forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: minor refactoring

Browse source
This commit is contained in:
Vlad 2018-01-09 13:39:36 +02:00
parent e33ef228f4
commit c27badee7e
3 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
whisper/whisperv6/api.go
View file

@ -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)
if err != nil {
return false, err
}
return true, nil
return true, api.w.SetMaxMessageSize(size)
}
// 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)
if err != nil {
return false, err
}
return true, nil
return true, api.w.SetMinimumPoW(pow)
}
// 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)
if err != nil {
return false, err
}
return true, nil
return true, api.w.SetBloomFilter(bloom)
}
// MarkTrustedPeer marks a peer trusted, which will allow it to send historic (expired) messages.

4
whisper/whisperv6/peer_test.go
View file

@ -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)
}

9
whisper/whisperv6/whisper.go
View file

@ -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
}