Skip to content

Commit 6f74b27

Browse files
authored
Merge pull request #592 from pinheadmz/selfnodes
add podname-indexed dict "self.tanks" to Commander
2 parents 4c613db + 8aca2c1 commit 6f74b27

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

resources/scenarios/commander.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import sys
1010
import tempfile
1111
from pathlib import Path
12+
from typing import Dict
1213

1314
from test_framework.authproxy import AuthServiceProxy
1415
from test_framework.p2p import NetworkThread
@@ -80,6 +81,9 @@ def setup(self):
8081
ch.setFormatter(formatter)
8182
self.log.addHandler(ch)
8283

84+
# Keep a separate index of tanks by pod name
85+
self.tanks: Dict[str, TestNode] = {}
86+
8387
for i, tank in enumerate(WARNET):
8488
self.log.info(
8589
f"Adding TestNode #{i} from pod {tank['tank']} with IP {tank['rpc_host']}"
@@ -106,6 +110,7 @@ def setup(self):
106110
node.rpc_connected = True
107111
node.init_peers = tank["init_peers"]
108112
self.nodes.append(node)
113+
self.tanks[tank["tank"]] = node
109114

110115
self.num_nodes = len(self.nodes)
111116

test/data/scenario_connect_dag.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ def run_test(self):
5656
self.connect_nodes(6, 7)
5757
self.sync_all()
5858

59-
zero_peers = self.nodes[0].getpeerinfo()
60-
one_peers = self.nodes[1].getpeerinfo()
61-
two_peers = self.nodes[2].getpeerinfo()
62-
three_peers = self.nodes[3].getpeerinfo()
63-
four_peers = self.nodes[4].getpeerinfo()
64-
five_peers = self.nodes[5].getpeerinfo()
65-
six_peers = self.nodes[6].getpeerinfo()
66-
seven_peers = self.nodes[7].getpeerinfo()
67-
eight_peers = self.nodes[8].getpeerinfo()
68-
nine_peers = self.nodes[9].getpeerinfo()
59+
zero_peers = self.tanks["tank-0000"].getpeerinfo()
60+
one_peers = self.tanks["tank-0001"].getpeerinfo()
61+
two_peers = self.tanks["tank-0002"].getpeerinfo()
62+
three_peers = self.tanks["tank-0003"].getpeerinfo()
63+
four_peers = self.tanks["tank-0004"].getpeerinfo()
64+
five_peers = self.tanks["tank-0005"].getpeerinfo()
65+
six_peers = self.tanks["tank-0006"].getpeerinfo()
66+
seven_peers = self.tanks["tank-0007"].getpeerinfo()
67+
eight_peers = self.tanks["tank-0008"].getpeerinfo()
68+
nine_peers = self.tanks["tank-0009"].getpeerinfo()
6969

7070
for node in self.nodes:
7171
self.log.info(f"Node {node.index}: tank={node.tank} ip={node.rpchost}")

test/data/scenario_p2p_interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def run_test(self):
3434
self.log.info("Adding the p2p connection")
3535

3636
p2p_block_store = self.nodes[0].add_p2p_connection(
37-
P2PStoreBlock(), dstaddr=self.nodes[0].rpchost, dstport=18444
37+
P2PStoreBlock(), dstaddr=self.tanks["tank-0000"].rpchost, dstport=18444
3838
)
3939

4040
self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages")

0 commit comments

Comments
 (0)