whisper: build fix

This commit is contained in:
Vlad 2016-10-26 20:34:26 +02:00
parent 8f59d03fee
commit 827a835427

View file

@ -78,8 +78,8 @@ type TestData struct {
type TestNode struct { type TestNode struct {
shh *Whisper shh *Whisper
id *ecdsa.PrivateKey id *ecdsa.PrivateKey
server *p2p.Server
filerId int filerId int
server p2p.Server
} }
var result TestData var result TestData
@ -139,7 +139,7 @@ func initialize(x *testing.T) {
peers = append(peers, peer) peers = append(peers, peer)
} }
node.server = p2p.Server{ node.server = &p2p.Server{
Config: p2p.Config{ Config: p2p.Config{
PrivateKey: node.id, PrivateKey: node.id,
MaxPeers: NumNodes/2 + 1, MaxPeers: NumNodes/2 + 1,
@ -167,6 +167,7 @@ func stopServers() {
for i := 0; i < NumNodes; i++ { for i := 0; i < NumNodes; i++ {
n := nodes[i] n := nodes[i]
if n != nil { if n != nil {
n.shh.Unwatch(n.filerId)
n.server.Stop() n.server.Stop()
} }
} }
@ -196,6 +197,7 @@ func checkPropagation(x *testing.T) {
} }
if isTestComplete() { if isTestComplete() {
return return
} }
} }
@ -242,6 +244,14 @@ func isTestComplete() bool {
return false return false
} }
} }
for i := 0; i < NumNodes; i++ {
envelopes := nodes[i].shh.Envelopes()
if len(envelopes) < 2 {
return false
}
}
return true return true
} }