forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check peers properly

Browse source
This commit is contained in:
Adam Schmideg 2020-02-13 12:51:06 +01:00
parent 7b930f6fdb
commit 16a2401cff
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cmd/geth/les_test.go
View file

@ -39,7 +39,8 @@ func (g *gethrpc) addPeer(peer *gethrpc, eventsToWait int) {
} }
defer sub.Unsubscribe() defer sub.Unsubscribe()
g.callRPC(nil, "admin_addPeer", enode) g.callRPC(nil, "admin_addPeer", enode)
timeout := time.After(14 * time.Second) dur := 14 * time.Second
timeout := time.After(dur)
for i := 0; i < eventsToWait; i++ { for i := 0; i < eventsToWait; i++ {
select { select {
case ev := <-peerCh: case ev := <-peerCh:
@ -48,7 +49,7 @@ func (g *gethrpc) addPeer(peer *gethrpc, eventsToWait int) {
g.geth.Fatalf("%v sub error: %v", g.name, err) g.geth.Fatalf("%v sub error: %v", g.name, err)
return return
case <-timeout: case <-timeout:
g.geth.Error("timeout adding peer") g.geth.Error("timeout adding peer after", dur)
return return
} }
} }
@ -105,6 +106,7 @@ func (g *gethrpc) waitSynced() {
func startGethWithRpc(t *testing.T, name string, args ...string) *gethrpc { func startGethWithRpc(t *testing.T, name string, args ...string) *gethrpc {
g := &gethrpc{name: name} g := &gethrpc{name: name}
args = append([]string{"--networkid=42", "--port=0", "--nousb", "--rpc", "--rpcport=0", "--rpcapi=admin,eth,les"}, args...) args = append([]string{"--networkid=42", "--port=0", "--nousb", "--rpc", "--rpcport=0", "--rpcapi=admin,eth,les"}, args...)
t.Logf("Starting %v with rpc: %v", name, args)
g.geth = runGeth(t, args...) g.geth = runGeth(t, args...)
// wait before we can attach to it. TODO: probe for it properly // wait before we can attach to it. TODO: probe for it properly
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
@ -114,7 +116,6 @@ func startGethWithRpc(t *testing.T, name string, args ...string) *gethrpc {
if err != nil { if err != nil {
t.Fatalf("%v rpc connect: %v", name, err) t.Fatalf("%v rpc connect: %v", name, err)
} }
t.Logf("Started with rpc: %v", name)
return g return g
} }
@ -140,6 +141,7 @@ func startClient(t *testing.T, name string) *gethrpc {
} }
func TestPriorityClient(t *testing.T) { func TestPriorityClient(t *testing.T) {
// Init and start server // Init and start server
server := startServer(t) server := startServer(t)
defer server.killAndWait() defer server.killAndWait()
@ -179,11 +181,22 @@ func TestPriorityClient(t *testing.T) {
t.Errorf("Expected: # of prio peers == 1, actual: %v", len(peers)) t.Errorf("Expected: # of prio peers == 1, actual: %v", len(peers))
} }
lightServer.callRPC(&peers, "admin_peers") nodes := map[string]*gethrpc{
for _, p := range peers { server.getNodeInfo().ID: server,
if p.Enode == client.getNodeInfo().Enode { lightServer.getNodeInfo().ID: lightServer,
t.Error("client is still a peer of lightServer") client.getNodeInfo().ID: client,
prio.getNodeInfo().ID: prio,
} }
lightServer.callRPC(&peers, "admin_peers")
peersWithNames := make(map[string]string)
for _, p := range peers {
peersWithNames[nodes[p.ID].name] = p.ID
}
if _, freeClientFound := peersWithNames[client.name]; freeClientFound {
t.Error("client is still a peer of lightServer", peersWithNames)
}
if _, prioClientFound := peersWithNames[prio.name]; !prioClientFound {
t.Error("prio client is not among lightServer peers", peersWithNames)
} }
client.callRPC(&peers, "admin_peers") client.callRPC(&peers, "admin_peers")