sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2024-09-19 11:21:16 +00:00
parent c200175ebf
commit 4a0fc8b69e
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/feature_dip3_v19.py
View File

@ -54,8 +54,7 @@ class DIP3V19Test(DashTestFramework):
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()

4
test/functional/feature_llmq_chainlocks.py
View File

@ -23,13 +23,11 @@ class LLMQChainLocksTest(DashTestFramework):
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)

3
test/functional/feature_llmq_evo.py
View File

@ -58,8 +58,7 @@ class LLMQEvoNodesTest(DashTestFramework):
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)

3
test/functional/feature_llmq_rotation.py
View File

@ -65,8 +65,7 @@ class LLMQQuorumRotationTest(DashTestFramework):
# 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()

2
test/functional/feature_mnehf.py
View File

@ -43,7 +43,7 @@ class MnehfTest(DashTestFramework):
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")

8
test/functional/test_framework/test_framework.py
View File

@ -692,6 +692,10 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
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 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
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 = []