From 40f2ab906ca8fa1912daff0461b82419ef1de253 Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:29:46 +0000 Subject: [PATCH] test: don't attempt to reconnect already connected nodes --- test/functional/feature_dip3_v19.py | 3 --- test/functional/feature_llmq_chainlocks.py | 2 +- test/functional/feature_llmq_evo.py | 3 --- test/functional/feature_llmq_rotation.py | 3 --- test/functional/rpc_net.py | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/test/functional/feature_dip3_v19.py b/test/functional/feature_dip3_v19.py index 1f2376d62e..f5c1a5e59c 100755 --- a/test/functional/feature_dip3_v19.py +++ b/test/functional/feature_dip3_v19.py @@ -53,9 +53,6 @@ class DIP3V19Test(DashTestFramework): self.test_node = self.nodes[0].add_p2p_connection(TestP2PConn()) null_hash = format(0, "064x") - for i in range(len(self.nodes)): - 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 index a7dfc132cc..7cebc7c5ca 100755 --- a/test/functional/feature_llmq_chainlocks.py +++ b/test/functional/feature_llmq_chainlocks.py @@ -26,7 +26,7 @@ class LLMQChainLocksTest(DashTestFramework): # 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)): + for i in range(2, len(self.nodes)): 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 index 1135bedda4..a247bcf31c 100755 --- a/test/functional/feature_llmq_evo.py +++ b/test/functional/feature_llmq_evo.py @@ -57,9 +57,6 @@ class LLMQEvoNodesTest(DashTestFramework): self.test_node = self.nodes[0].add_p2p_connection(TestP2PConn()) null_hash = format(0, "064x") - for i in range(len(self.nodes)): - self.connect_nodes(i, 0) - self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0) self.nodes[0].sporkupdate("SPORK_2_INSTANTSEND_ENABLED", 1) self.wait_for_sporks_same() diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py index c8f9f45437..988e2719d8 100755 --- a/test/functional/feature_llmq_rotation.py +++ b/test/functional/feature_llmq_rotation.py @@ -64,9 +64,6 @@ class LLMQQuorumRotationTest(DashTestFramework): # 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)): - 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/rpc_net.py b/test/functional/rpc_net.py index 1972a94984..7eab8898f8 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -213,7 +213,6 @@ class NetTest(DashTestFramework): self.log.info('Test extended connections info') # Connect nodes both ways. - self.connect_nodes(0, 1) self.connect_nodes(1, 0) assert_equal(self.nodes[1].getnetworkinfo()['connections'], 2)