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: tests fixed

Browse source
This commit is contained in:
Vlad 2018-01-13 09:05:27 +02:00
parent 7d58a9bbdd
commit f1b5e24264
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
whisper/whisperv6/peer_test.go
View file

@ -123,11 +123,6 @@ func TestSimulation(t *testing.T) {
// check if each node (except node #0) have received and decrypted exactly one message // check if each node (except node #0) have received and decrypted exactly one message
checkPropagation(t, false) checkPropagation(t, false)
for i := 1; i < NumNodes; i++ {
time.Sleep(20 * time.Millisecond)
sendMsg(t, true, i)
}
// check if corresponding protocol-level messages were correctly decoded // check if corresponding protocol-level messages were correctly decoded
checkPowExchangeForNodeZero(t) checkPowExchangeForNodeZero(t)
checkBloomFilterExchange(t) checkBloomFilterExchange(t)
@ -419,13 +414,31 @@ func checkPowExchange(t *testing.T) {
} }
} }
func checkBloomFilterExchange(t *testing.T) { func checkBloomFilterExchangeOnce(t *testing.T, mustPass bool) bool {
for i, node := range nodes { for i, node := range nodes {
for peer := range node.shh.peers { for peer := range node.shh.peers {
if !bytes.Equal(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", if mustPass {
i, round, masterBloomFilter, peer.bloomFilter) t.Fatalf("node %d: failed to exchange bloom filter requirement in round %d. \n%x expected \n%x got",
i, round, masterBloomFilter, peer.bloomFilter)
} else {
return false
}
} }
} }
} }
return true
}
func checkBloomFilterExchange(t *testing.T) {
const iterations = 128
for j := 0; j < iterations; j++ {
lastCycle := (j == iterations-1)
ok := checkBloomFilterExchangeOnce(t, lastCycle)
if ok {
break
}
time.Sleep(50 * time.Millisecond)
}
} }