|
|
|
@ -22,7 +22,6 @@ import ( |
|
|
|
|
"fmt" |
|
|
|
|
mrand "math/rand" |
|
|
|
|
"sync" |
|
|
|
|
"sync/atomic" |
|
|
|
|
"testing" |
|
|
|
|
"time" |
|
|
|
|
|
|
|
|
@ -74,7 +73,6 @@ var keys = []string{ |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
type TestData struct { |
|
|
|
|
started int64 |
|
|
|
|
counter [NumNodes]int |
|
|
|
|
mutex sync.RWMutex |
|
|
|
|
} |
|
|
|
@ -212,13 +210,10 @@ func initialize(t *testing.T) { |
|
|
|
|
}, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
go startServer(t, node.server) |
|
|
|
|
|
|
|
|
|
startServer(t, node.server) |
|
|
|
|
nodes[i] = &node |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
waitForServersToStart(t) |
|
|
|
|
|
|
|
|
|
for i := 0; i < NumNodes; i++ { |
|
|
|
|
for j := 0; j < i; j++ { |
|
|
|
|
peerNodeId := nodes[j].id |
|
|
|
@ -234,8 +229,6 @@ func startServer(t *testing.T, s *p2p.Server) { |
|
|
|
|
if err != nil { |
|
|
|
|
t.Fatalf("failed to start the first server. err: %v", err) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
atomic.AddInt64(&result.started, 1) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func stopServers() { |
|
|
|
@ -494,19 +487,6 @@ func checkBloomFilterExchange(t *testing.T) { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func waitForServersToStart(t *testing.T) { |
|
|
|
|
const iterations = 200 |
|
|
|
|
var started int64 |
|
|
|
|
for j := 0; j < iterations; j++ { |
|
|
|
|
time.Sleep(50 * time.Millisecond) |
|
|
|
|
started = atomic.LoadInt64(&result.started) |
|
|
|
|
if started == NumNodes { |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
t.Fatalf("Failed to start all the servers, running: %d", started) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//two generic whisper node handshake
|
|
|
|
|
func TestPeerHandshakeWithTwoFullNode(t *testing.T) { |
|
|
|
|
w1 := Whisper{} |
|
|
|
|