forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

p2p/simulations: Fix HTTP tests

Browse source 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
This commit is contained in:
Lewis Marshall 2017-05-28 19:39:33 +01:00
parent 69c2e537c6
commit 1341843f7e
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
p2p/simulations/http_test.go
View file

@ -185,8 +185,7 @@ func TestHTTPNetwork(t *testing.T) {
// create 2 nodes
nodeIDs := make([]string, 2)
for i := 0; i < 2; i++ {
config := &adapters.NodeConfig{}
node, err := client.CreateNode(network.ID, config)
node, err := client.CreateNode(network.ID, nil)
if err != nil {
t.Fatalf("error creating node: %s", err)
}
@ -286,8 +285,8 @@ func (t *expectEvents) expect(events ...*Event) {
if event.Node == nil {
t.Fatal("expected event.Node to be set")
}
if event.Node.ID().NodeID != expected.Node.ID().NodeID {
t.Fatalf("expected node event %d to have id %q, got %q", i, expected.Node.ID().Label(), event.Node.ID().Label())
if event.Node.ID() != expected.Node.ID() {
t.Fatalf("expected node event %d to have id %q, got %q", i, expected.Node.ID().TerminalString(), event.Node.ID().TerminalString())
}
if event.Node.Up != expected.Node.Up {
t.Fatalf("expected node event %d to have up=%t, got up=%t", i, expected.Node.Up, event.Node.Up)
@ -297,17 +296,11 @@ func (t *expectEvents) expect(events ...*Event) {
if event.Conn == nil {
t.Fatal("expected event.Conn to be set")
}
if event.Conn.One == nil {
t.Fatal("expected event.Conn.One to be set")
if event.Conn.One != expected.Conn.One {
t.Fatalf("expected conn event %d to have one=%q, got one=%q", i, expected.Conn.One.TerminalString(), event.Conn.One.TerminalString())
}
if event.Conn.Other == nil {
t.Fatal("expected event.Conn.Other to be set")
}
if event.Conn.One.NodeID != expected.Conn.One.NodeID {
t.Fatalf("expected conn event %d to have one=%q, got one=%q", i, expected.Conn.One.Label(), event.Conn.One.Label())
}
if event.Conn.Other.NodeID != expected.Conn.Other.NodeID {
t.Fatalf("expected conn event %d to have other=%q, got other=%q", i, expected.Conn.Other.Label(), event.Conn.Other.Label())
if event.Conn.Other != expected.Conn.Other {
t.Fatalf("expected conn event %d to have other=%q, got other=%q", i, expected.Conn.Other.TerminalString(), event.Conn.Other.TerminalString())
}
if event.Conn.Up != expected.Conn.Up {
t.Fatalf("expected conn event %d to have up=%t, got up=%t", i, expected.Conn.Up, event.Conn.Up)
@ -335,7 +328,7 @@ func TestHTTPNodeRPC(t *testing.T) {
if err != nil {
t.Fatalf("error creating network: %s", err)
}
node, err := client.CreateNode(network.ID, &adapters.NodeConfig{})
node, err := client.CreateNode(network.ID, nil)
if err != nil {
t.Fatalf("error creating node: %s", err)
}
@ -401,7 +394,7 @@ func TestHTTPSnapshot(t *testing.T) {
nodeCount := 2
nodes := make([]*p2p.NodeInfo, nodeCount)
for i := 0; i < nodeCount; i++ {
node, err := client.CreateNode(network.ID, &adapters.NodeConfig{})
node, err := client.CreateNode(network.ID, nil)
if err != nil {
t.Fatalf("error creating node: %s", err)
}
@ -435,8 +428,9 @@ func TestHTTPSnapshot(t *testing.T) {
t.Fatalf("error creating snapshot: %s", err)
}
for i, state := range states {
if string(snap.Nodes[i].Snapshot) != state {
t.Fatalf("expected snapshot state %q, got %q", state, snap.Nodes[i].Snapshot)
gotState := snap.Nodes[i].Snapshots["test"]
if string(gotState) != state {
t.Fatalf("expected snapshot state %q, got %q", state, gotState)
}
}