@@ -52,7 +52,7 @@ procSuite "Peer Manager":
52
52
await allFutures (nodes.mapIt (it.mountFilter ()))
53
53
54
54
# Dial node2 from node1
55
- let conn = await nodes[0 ].peerManager.dialPeer (nodes[1 ].peerInfo.toRemotePeerInfo (), WakuFilterCodec )
55
+ let conn = await nodes[0 ].peerManager.dialPeer (nodes[1 ].peerInfo.toRemotePeerInfo (), WakuLegacyFilterCodec )
56
56
# Check connection
57
57
check:
58
58
conn.isSome ()
@@ -81,12 +81,12 @@ procSuite "Peer Manager":
81
81
let nonExistentPeer = nonExistentPeerRes.value
82
82
83
83
# Dial non-existent peer from node1
84
- let conn1 = await nodes[0 ].peerManager.dialPeer (nonExistentPeer, WakuFilterCodec )
84
+ let conn1 = await nodes[0 ].peerManager.dialPeer (nonExistentPeer, WakuLegacyFilterCodec )
85
85
check:
86
86
conn1.isNone ()
87
87
88
88
# Dial peer not supporting given protocol
89
- let conn2 = await nodes[0 ].peerManager.dialPeer (nodes[1 ].peerInfo.toRemotePeerInfo (), WakuFilterCodec )
89
+ let conn2 = await nodes[0 ].peerManager.dialPeer (nodes[1 ].peerInfo.toRemotePeerInfo (), WakuLegacyFilterCodec )
90
90
check:
91
91
conn2.isNone ()
92
92
@@ -109,14 +109,14 @@ procSuite "Peer Manager":
109
109
node.mountStoreClient ()
110
110
111
111
node.peerManager.addServicePeer (storePeer.toRemotePeerInfo (), WakuStoreCodec )
112
- node.peerManager.addServicePeer (filterPeer.toRemotePeerInfo (), WakuFilterCodec )
112
+ node.peerManager.addServicePeer (filterPeer.toRemotePeerInfo (), WakuLegacyFilterCodec )
113
113
114
114
# Check peers were successfully added to peer manager
115
115
check:
116
116
node.peerManager.peerStore.peers ().len == 2
117
- node.peerManager.peerStore.peers (WakuFilterCodec ).allIt (it.peerId == filterPeer.peerId and
117
+ node.peerManager.peerStore.peers (WakuLegacyFilterCodec ).allIt (it.peerId == filterPeer.peerId and
118
118
it.addrs.contains (filterLoc) and
119
- it.protocols.contains (WakuFilterCodec ))
119
+ it.protocols.contains (WakuLegacyFilterCodec ))
120
120
node.peerManager.peerStore.peers (WakuStoreCodec ).allIt (it.peerId == storePeer.peerId and
121
121
it.addrs.contains (storeLoc) and
122
122
it.protocols.contains (WakuStoreCodec ))
@@ -429,7 +429,7 @@ procSuite "Peer Manager":
429
429
430
430
# service peers
431
431
node.peerManager.addServicePeer (peers[0 ], WakuStoreCodec )
432
- node.peerManager.addServicePeer (peers[1 ], WakuFilterCodec )
432
+ node.peerManager.addServicePeer (peers[1 ], WakuLegacyFilterCodec )
433
433
node.peerManager.addServicePeer (peers[2 ], WakuLightPushCodec )
434
434
node.peerManager.addServicePeer (peers[3 ], WakuPeerExchangeCodec )
435
435
@@ -449,7 +449,7 @@ procSuite "Peer Manager":
449
449
# all service peers are added to its service slot
450
450
check:
451
451
node.peerManager.serviceSlots[WakuStoreCodec ].peerId == peers[0 ].peerId
452
- node.peerManager.serviceSlots[WakuFilterCodec ].peerId == peers[1 ].peerId
452
+ node.peerManager.serviceSlots[WakuLegacyFilterCodec ].peerId == peers[1 ].peerId
453
453
node.peerManager.serviceSlots[WakuLightPushCodec ].peerId == peers[2 ].peerId
454
454
node.peerManager.serviceSlots[WakuPeerExchangeCodec ].peerId == peers[3 ].peerId
455
455
@@ -474,38 +474,38 @@ procSuite "Peer Manager":
474
474
(await nodes[0 ].peerManager.connectRelay (pInfos[2 ])) == true
475
475
(await nodes[1 ].peerManager.connectRelay (pInfos[2 ])) == true
476
476
477
- (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuFilterCodec )).isSome () == true
478
- (await nodes[0 ].peerManager.dialPeer (pInfos[2 ], WakuFilterCodec )).isSome () == true
477
+ (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuLegacyFilterCodec )).isSome () == true
478
+ (await nodes[0 ].peerManager.dialPeer (pInfos[2 ], WakuLegacyFilterCodec )).isSome () == true
479
479
480
480
# isolated dial creates a relay conn under the hood (libp2p behaviour)
481
- (await nodes[2 ].peerManager.dialPeer (pInfos[3 ], WakuFilterCodec )).isSome () == true
481
+ (await nodes[2 ].peerManager.dialPeer (pInfos[3 ], WakuLegacyFilterCodec )).isSome () == true
482
482
483
483
484
484
# assert physical connections
485
485
check:
486
486
nodes[0 ].peerManager.connectedPeers (WakuRelayCodec )[0 ].len == 0
487
487
nodes[0 ].peerManager.connectedPeers (WakuRelayCodec )[1 ].len == 2
488
488
489
- nodes[0 ].peerManager.connectedPeers (WakuFilterCodec )[0 ].len == 0
490
- nodes[0 ].peerManager.connectedPeers (WakuFilterCodec )[1 ].len == 2
489
+ nodes[0 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[0 ].len == 0
490
+ nodes[0 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[1 ].len == 2
491
491
492
492
nodes[1 ].peerManager.connectedPeers (WakuRelayCodec )[0 ].len == 1
493
493
nodes[1 ].peerManager.connectedPeers (WakuRelayCodec )[1 ].len == 1
494
494
495
- nodes[1 ].peerManager.connectedPeers (WakuFilterCodec )[0 ].len == 1
496
- nodes[1 ].peerManager.connectedPeers (WakuFilterCodec )[1 ].len == 0
495
+ nodes[1 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[0 ].len == 1
496
+ nodes[1 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[1 ].len == 0
497
497
498
498
nodes[2 ].peerManager.connectedPeers (WakuRelayCodec )[0 ].len == 2
499
499
nodes[2 ].peerManager.connectedPeers (WakuRelayCodec )[1 ].len == 1
500
500
501
- nodes[2 ].peerManager.connectedPeers (WakuFilterCodec )[0 ].len == 1
502
- nodes[2 ].peerManager.connectedPeers (WakuFilterCodec )[1 ].len == 1
501
+ nodes[2 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[0 ].len == 1
502
+ nodes[2 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[1 ].len == 1
503
503
504
504
nodes[3 ].peerManager.connectedPeers (WakuRelayCodec )[0 ].len == 1
505
505
nodes[3 ].peerManager.connectedPeers (WakuRelayCodec )[1 ].len == 0
506
506
507
- nodes[3 ].peerManager.connectedPeers (WakuFilterCodec )[0 ].len == 1
508
- nodes[3 ].peerManager.connectedPeers (WakuFilterCodec )[1 ].len == 0
507
+ nodes[3 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[0 ].len == 1
508
+ nodes[3 ].peerManager.connectedPeers (WakuLegacyFilterCodec )[1 ].len == 0
509
509
510
510
asyncTest " getNumStreams() returns expected number of connections per protocol" :
511
511
# Create 2 nodes
@@ -521,17 +521,17 @@ procSuite "Peer Manager":
521
521
require:
522
522
# multiple streams are multiplexed over a single connection.
523
523
# note that a relay connection is created under the hood when dialing a peer (libp2p behaviour)
524
- (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuFilterCodec )).isSome () == true
525
- (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuFilterCodec )).isSome () == true
526
- (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuFilterCodec )).isSome () == true
527
- (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuFilterCodec )).isSome () == true
524
+ (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuLegacyFilterCodec )).isSome () == true
525
+ (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuLegacyFilterCodec )).isSome () == true
526
+ (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuLegacyFilterCodec )).isSome () == true
527
+ (await nodes[0 ].peerManager.dialPeer (pInfos[1 ], WakuLegacyFilterCodec )).isSome () == true
528
528
529
529
check:
530
530
nodes[0 ].peerManager.getNumStreams (WakuRelayCodec ) == (1 , 1 )
531
- nodes[0 ].peerManager.getNumStreams (WakuFilterCodec ) == (0 , 4 )
531
+ nodes[0 ].peerManager.getNumStreams (WakuLegacyFilterCodec ) == (0 , 4 )
532
532
533
533
nodes[1 ].peerManager.getNumStreams (WakuRelayCodec ) == (1 , 1 )
534
- nodes[1 ].peerManager.getNumStreams (WakuFilterCodec ) == (4 , 0 )
534
+ nodes[1 ].peerManager.getNumStreams (WakuLegacyFilterCodec ) == (4 , 0 )
535
535
536
536
test " selectPeer() returns the correct peer" :
537
537
# Valid peer id missing the last digit
@@ -552,7 +552,7 @@ procSuite "Peer Manager":
552
552
553
553
# Add a peer[0] to the peerstore
554
554
pm.peerStore[AddressBook ][peers[0 ].peerId] = peers[0 ].addrs
555
- pm.peerStore[ProtoBook ][peers[0 ].peerId] = @ [WakuRelayCodec , WakuStoreCodec , WakuFilterCodec ]
555
+ pm.peerStore[ProtoBook ][peers[0 ].peerId] = @ [WakuRelayCodec , WakuStoreCodec , WakuLegacyFilterCodec ]
556
556
557
557
# When no service peers, we get one from the peerstore
558
558
let selectedPeer1 = pm.selectPeer (WakuStoreCodec )
@@ -561,7 +561,7 @@ procSuite "Peer Manager":
561
561
selectedPeer1.get ().peerId == peers[0 ].peerId
562
562
563
563
# Same for other protocol
564
- let selectedPeer2 = pm.selectPeer (WakuFilterCodec )
564
+ let selectedPeer2 = pm.selectPeer (WakuLegacyFilterCodec )
565
565
check:
566
566
selectedPeer2.isSome () == true
567
567
selectedPeer2.get ().peerId == peers[0 ].peerId
@@ -757,7 +757,7 @@ procSuite "Peer Manager":
757
757
discard await nodes[0 ].peerManager.connectRelay (pInfos[3 ])
758
758
discard await nodes[0 ].peerManager.connectRelay (pInfos[4 ])
759
759
760
- # they are also prunned
760
+ # they are also prunned
761
761
check nodes[0 ].peerManager.switch.connManager.getConnections ().len == 1
762
762
763
763
# we should have 4 peers (2in/2out) but due to collocation limit
0 commit comments