aboutsummaryrefslogtreecommitdiffstats
path: root/swarm/network/stream/streamer_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'swarm/network/stream/streamer_test.go')
-rw-r--r--swarm/network/stream/streamer_test.go78
1 files changed, 39 insertions, 39 deletions
diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go
index dba4e7ea3..ba4328eef 100644
--- a/swarm/network/stream/streamer_test.go
+++ b/swarm/network/stream/streamer_test.go
@@ -35,7 +35,7 @@ func TestStreamerSubscribe(t *testing.T) {
}
stream := NewStream("foo", "", true)
- err = streamer.Subscribe(tester.IDs[0], stream, NewRange(0, 0), Top)
+ err = streamer.Subscribe(tester.Nodes[0].ID(), stream, NewRange(0, 0), Top)
if err == nil || err.Error() != "stream foo not registered" {
t.Fatalf("Expected error %v, got %v", "stream foo not registered", err)
}
@@ -49,7 +49,7 @@ func TestStreamerRequestSubscription(t *testing.T) {
}
stream := NewStream("foo", "", false)
- err = streamer.RequestSubscription(tester.IDs[0], stream, &Range{}, Top)
+ err = streamer.RequestSubscription(tester.Nodes[0].ID(), stream, &Range{}, Top)
if err == nil || err.Error() != "stream foo not registered" {
t.Fatalf("Expected error %v, got %v", "stream foo not registered", err)
}
@@ -137,10 +137,10 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
return newTestClient(t), nil
})
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
stream := NewStream("foo", "", true)
- 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)
}
@@ -156,7 +156,7 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -175,7 +175,7 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
To: 8,
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -187,7 +187,7 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
From: 9,
To: 0,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -196,7 +196,7 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
t.Fatal(err)
}
- err = streamer.Unsubscribe(peerID, stream)
+ err = streamer.Unsubscribe(node.ID(), stream)
if err != nil {
t.Fatalf("Expected no error, got %v", err)
}
@@ -209,7 +209,7 @@ func TestStreamerDownstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
Msg: &UnsubscribeMsg{
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -232,7 +232,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
return newTestServer(t), nil
})
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
err = tester.TestExchanges(p2ptest.Exchange{
Label: "Subscribe message",
@@ -244,7 +244,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -259,7 +259,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
From: 6,
To: 9,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -276,7 +276,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchange(t *testing.T) {
Msg: &UnsubscribeMsg{
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -299,7 +299,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchangeLive(t *testing.T) {
return newTestServer(t), nil
})
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
err = tester.TestExchanges(p2ptest.Exchange{
Label: "Subscribe message",
@@ -310,7 +310,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchangeLive(t *testing.T) {
Stream: stream,
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -325,7 +325,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchangeLive(t *testing.T) {
From: 1,
To: 1,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -342,7 +342,7 @@ func TestStreamerUpstreamSubscribeUnsubscribeMsgExchangeLive(t *testing.T) {
Msg: &UnsubscribeMsg{
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -365,7 +365,7 @@ func TestStreamerUpstreamSubscribeErrorMsgExchange(t *testing.T) {
stream := NewStream("bar", "", true)
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
err = tester.TestExchanges(p2ptest.Exchange{
Label: "Subscribe message",
@@ -377,7 +377,7 @@ func TestStreamerUpstreamSubscribeErrorMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -386,7 +386,7 @@ func TestStreamerUpstreamSubscribeErrorMsgExchange(t *testing.T) {
Msg: &SubscribeErrorMsg{
Error: "stream bar not registered",
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -411,7 +411,7 @@ func TestStreamerUpstreamSubscribeLiveAndHistory(t *testing.T) {
}, nil
})
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
err = tester.TestExchanges(p2ptest.Exchange{
Label: "Subscribe message",
@@ -423,7 +423,7 @@ func TestStreamerUpstreamSubscribeLiveAndHistory(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -438,7 +438,7 @@ func TestStreamerUpstreamSubscribeLiveAndHistory(t *testing.T) {
From: 6,
To: 9,
},
- Peer: peerID,
+ Peer: node.ID(),
},
{
Code: 1,
@@ -451,7 +451,7 @@ func TestStreamerUpstreamSubscribeLiveAndHistory(t *testing.T) {
To: 1,
Hashes: make([]byte, HashSize),
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -542,9 +542,9 @@ func TestStreamerDownstreamOfferedHashesMsgExchange(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)
}
@@ -559,7 +559,7 @@ func TestStreamerDownstreamOfferedHashesMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -577,7 +577,7 @@ func TestStreamerDownstreamOfferedHashesMsgExchange(t *testing.T) {
To: 8,
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -589,7 +589,7 @@ func TestStreamerDownstreamOfferedHashesMsgExchange(t *testing.T) {
From: 9,
To: 0,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -636,10 +636,10 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
return newTestServer(t), nil
})
- peerID := tester.IDs[0]
+ node := tester.Nodes[0]
stream := NewStream("foo", "", true)
- err = streamer.RequestSubscription(peerID, stream, NewRange(5, 8), Top)
+ err = streamer.RequestSubscription(node.ID(), stream, NewRange(5, 8), Top)
if err != nil {
t.Fatalf("Expected no error, got %v", err)
}
@@ -655,7 +655,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -669,7 +669,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
History: NewRange(5, 8),
Priority: Top,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
Expects: []p2ptest.Expect{
@@ -684,7 +684,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
From: 6,
To: 9,
},
- Peer: peerID,
+ Peer: node.ID(),
},
{
Code: 1,
@@ -697,7 +697,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
To: 1,
Hashes: make([]byte, HashSize),
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
},
@@ -706,7 +706,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
t.Fatal(err)
}
- err = streamer.Quit(peerID, stream)
+ err = streamer.Quit(node.ID(), stream)
if err != nil {
t.Fatalf("Expected no error, got %v", err)
}
@@ -719,7 +719,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
Msg: &QuitMsg{
Stream: stream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
@@ -730,7 +730,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
historyStream := getHistoryStream(stream)
- err = streamer.Quit(peerID, historyStream)
+ err = streamer.Quit(node.ID(), historyStream)
if err != nil {
t.Fatalf("Expected no error, got %v", err)
}
@@ -743,7 +743,7 @@ func TestStreamerRequestSubscriptionQuitMsgExchange(t *testing.T) {
Msg: &QuitMsg{
Stream: historyStream,
},
- Peer: peerID,
+ Peer: node.ID(),
},
},
})
generated by cgit (git 2.34.1) at 2024-10-13 14:28:19 +0800