aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanos Guljas <janos@resenje.org>2018-09-28 17:07:00 +0800
committerJanos Guljas <janos@resenje.org>2018-09-28 17:07:00 +0800
commitc63985d194272867a718dc6dfc10f5393cf239f6 (patch)
tree57ac54e3516992f1ac5cb6d3c0f1c2096c527f58
parentbd1f74f654d670d3ddf93a208a526ebdf1ba6b2d (diff)
parentd8d86692716158f9d514dcaa06b69f129d43c3d8 (diff)
downloaddexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar.gz
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar.bz2
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar.lz
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar.xz
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.tar.zst
dexon-c63985d194272867a718dc6dfc10f5393cf239f6.zip
Merge branch 'master' into cmd-config-errors
-rw-r--r--swarm/network/stream/streamer_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go
index ba4328eef..0390a7b9b 100644
--- a/swarm/network/stream/streamer_test.go
+++ b/swarm/network/stream/streamer_test.go
@@ -477,9 +477,9 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
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 {
t.Fatalf("Expected no error, got %v", err)
}
@@ -494,7 +494,7 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -512,7 +512,7 @@ func TestStreamerDownstreamCorruptHashesMsgExchange(t *testing.T) {
To: 8,
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)")
- 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)
}
}