interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into cmd-config-errors

This commit is contained in:
Janos Guljas 2018-09-28 11:07:00 +02:00
parent bd1f74f654 d8d8669271
commit c63985d194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swarm/network/stream/streamer_test.go
View File

@ -477,9 +477,9 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
return tc, nil return tc, nil
}) })
peerID := tester.IDs[0] node := tester.Nodes[0]
err = streamer.Subscribe(peerID, stream, NewRange(5, 8), Top) err = streamer.Subscribe(node.ID(), stream, NewRange(5, 8), Top)
if err != nil { if err != nil {
t.Fatalf("Expected no error, got %v", err) t.Fatalf("Expected no error, got %v", err)
} }
@ -494,7 +494,7 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
History: NewRange(5, 8), History: NewRange(5, 8),
Priority: Top, Priority: Top,
}, },
Peer: peerID, Peer: node.ID(),
}, },
}, },
}, },
@ -512,7 +512,7 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
To: 8, To: 8,
Stream: stream, Stream: stream,
}, },
Peer: peerID, Peer: node.ID(),
}, },
}, },
}) })
@ -521,7 +521,7 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
} }
expectedError := errors.New("Message handler error: (msg code 1): error invalid hashes length (len: 40)") expectedError := errors.New("Message handler error: (msg code 1): error invalid hashes length (len: 40)")
if err := tester.TestDisconnected(&p2ptest.Disconnect{Peer: tester.IDs[0], Error: expectedError}); err != nil { if err := tester.TestDisconnected(&p2ptest.Disconnect{Peer: tester.Nodes[0].ID(), Error: expectedError}); err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }