test: don't attempt to (dis)connect nodes to/from themselves

dashpay · Sep 26, 2024 · 4a0fc8b · 4a0fc8b
1 parent c200175
commit 4a0fc8b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/test/functional/feature_dip3_v19.py b/test/functional/feature_dip3_v19.py
@@ -54,8 +54,7 @@ def run_test(self):
         null_hash = format(0, "064x")
 
         for i in range(len(self.nodes)):
-            if i != 0:
-                self.connect_nodes(i, 0)
+            self.connect_nodes(i, 0)
 
         self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0)
         self.wait_for_sporks_same()

diff --git a/test/functional/feature_llmq_chainlocks.py b/test/functional/feature_llmq_chainlocks.py
@@ -23,13 +23,11 @@ def set_test_params(self):
         self.set_dash_test_params(5, 4, fast_dip3_enforcement=True)
 
     def run_test(self):
-
         # Connect all nodes to node1 so that we always have the whole network connected
         # Otherwise only masternode connections will be established between nodes, which won't propagate TXs/blocks
         # Usually node0 is the one that does this, but in this test we isolate it multiple times
         for i in range(len(self.nodes)):
-            if i != 1:
-                self.connect_nodes(i, 1)
+            self.connect_nodes(i, 1)
 
         self.test_coinbase_best_cl(self.nodes[0], expected_cl_in_cb=False)
 

diff --git a/test/functional/feature_llmq_evo.py b/test/functional/feature_llmq_evo.py
@@ -58,8 +58,7 @@ def run_test(self):
         null_hash = format(0, "064x")
 
         for i in range(len(self.nodes)):
-            if i != 0:
-                self.connect_nodes(i, 0)
+            self.connect_nodes(i, 0)
 
         self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0)
         self.nodes[0].sporkupdate("SPORK_2_INSTANTSEND_ENABLED", 1)

diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py
@@ -65,8 +65,7 @@ def run_test(self):
         # Usually node0 is the one that does this, but in this test we isolate it multiple times
 
         for i in range(len(self.nodes)):
-            if i != 1:
-                self.connect_nodes(i, 0)
+            self.connect_nodes(i, 0)
 
         self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0)
         self.wait_for_sporks_same()

diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py
@@ -43,7 +43,7 @@ def restart_all_nodes(self, params=None):
             self.stop_node(index)
             self.start_masternode(mn)
         for i in range(1, self.num_nodes):
-                self.connect_nodes(i, 0)
+            self.connect_nodes(i, 0)
 
     def slowly_generate_batch(self, amount):
         self.log.info(f"Slowly generate {amount} blocks")

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -692,6 +692,10 @@ def wait_for_node_exit(self, i, timeout):
         self.nodes[i].process.wait(timeout)
 
     def connect_nodes(self, a, b):
+        # A node cannot connect to itself, bail out early
+        if (a == b):
+            return
+
         def connect_nodes_helper(from_connection, node_num):
             ip_port = "127.0.0.1:" + str(p2p_port(node_num))
             from_connection.addnode(ip_port, "onetry")
@@ -706,6 +710,10 @@ def connect_nodes_helper(from_connection, node_num):
         connect_nodes_helper(self.nodes[a], b)
 
     def disconnect_nodes(self, a, b):
+        # A node cannot disconnect from itself, bail out early
+        if (a == b):
+            return
+
         def disconnect_nodes_helper(from_connection, node_num):
             def get_peer_ids():
                 result = []