diff --git a/test/functional/feature_dip3_v19.py b/test/functional/feature_dip3_v19.py index 065fea1509..6ff2611bbd 100755 --- a/test/functional/feature_dip3_v19.py +++ b/test/functional/feature_dip3_v19.py @@ -46,7 +46,7 @@ class DIP3V19Test(DashTestFramework): self.extra_args = [[ '-testactivationheight=v20@1200', # required otherwise mine_quorum("llmq_test [100]") fails ]] * 6 - self.set_dash_test_params(6, 5, fast_dip3_enforcement=True, evo_count=2, extra_args=self.extra_args) + self.set_dash_test_params(6, 5, evo_count=2, extra_args=self.extra_args) def run_test(self): # Connect all nodes to node1 so that we always have the whole network connected diff --git a/test/functional/feature_dip4_coinbasemerkleroots.py b/test/functional/feature_dip4_coinbasemerkleroots.py index f0287c0796..d4fbf60795 100755 --- a/test/functional/feature_dip4_coinbasemerkleroots.py +++ b/test/functional/feature_dip4_coinbasemerkleroots.py @@ -44,7 +44,7 @@ class TestP2PConn(P2PInterface): class LLMQCoinbaseCommitmentsTest(DashTestFramework): def set_test_params(self): self.extra_args = [[ f'-testactivationheight=dip0008@{DIP0008_HEIGHT}', "-vbparams=testdummy:999999999999:999999999999" ]] * 4 - self.set_dash_test_params(4, 3, extra_args = self.extra_args, fast_dip3_enforcement=True) + self.set_dash_test_params(4, 3, extra_args = self.extra_args) def run_test(self): # No IS or Chainlocks in this test self.bump_mocktime(1) diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py index 0a38ac1eaa..58e4188824 100755 --- a/test/functional/feature_governance.py +++ b/test/functional/feature_governance.py @@ -18,7 +18,7 @@ class DashGovernanceTest (DashTestFramework): self.set_dash_test_params(6, 5, [[ "-budgetparams=10:10:10", '-testactivationheight=v20@160', - ]] * 6, fast_dip3_enforcement=True) + ]] * 6) def check_superblockbudget(self, v20_active): v20_state = self.nodes[0].getblockchaininfo()["softforks"]["v20"] diff --git a/test/functional/feature_governance_cl.py b/test/functional/feature_governance_cl.py index 99bdf3dfdd..718bdc80d3 100755 --- a/test/functional/feature_governance_cl.py +++ b/test/functional/feature_governance_cl.py @@ -14,7 +14,7 @@ from test_framework.util import assert_equal, satoshi_round class DashGovernanceTest (DashTestFramework): def set_test_params(self): - self.set_dash_test_params(6, 5, [["-budgetparams=10:10:10"]] * 6, fast_dip3_enforcement=True) + self.set_dash_test_params(6, 5, [["-budgetparams=10:10:10"]] * 6) def prepare_object(self, object_type, parent_hash, creation_time, revision, name, amount, payment_address): proposal_rev = revision diff --git a/test/functional/feature_llmq_chainlocks.py b/test/functional/feature_llmq_chainlocks.py index db23d2419e..49563bb46e 100755 --- a/test/functional/feature_llmq_chainlocks.py +++ b/test/functional/feature_llmq_chainlocks.py @@ -20,7 +20,7 @@ from test_framework.util import assert_equal, assert_raises_rpc_error, force_fin class LLMQChainLocksTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(5, 4, fast_dip3_enforcement=True) + self.set_dash_test_params(5, 4) def run_test(self): diff --git a/test/functional/feature_llmq_connections.py b/test/functional/feature_llmq_connections.py index 6440841071..f75edc94d5 100755 --- a/test/functional/feature_llmq_connections.py +++ b/test/functional/feature_llmq_connections.py @@ -17,7 +17,7 @@ from test_framework.util import assert_greater_than_or_equal class LLMQConnections(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(15, 14, fast_dip3_enforcement=True) + self.set_dash_test_params(15, 14) self.set_dash_llmq_test_params(5, 3) # Probes should age after this many seconds. # NOTE: mine_quorum() can bump mocktime quite often internally so make sure this number is high enough. diff --git a/test/functional/feature_llmq_data_recovery.py b/test/functional/feature_llmq_data_recovery.py index f6dcc395bb..97c12c6fd0 100755 --- a/test/functional/feature_llmq_data_recovery.py +++ b/test/functional/feature_llmq_data_recovery.py @@ -25,7 +25,7 @@ llmq_type_strings = {llmq_test: 'llmq_test', llmq_test_v17: 'llmq_test_v17'} class QuorumDataRecoveryTest(DashTestFramework): def set_test_params(self): extra_args = [["-vbparams=testdummy:0:999999999999:0:10:8:6:5:-1"] for _ in range(9)] - self.set_dash_test_params(9, 7, fast_dip3_enforcement=True, extra_args=extra_args) + self.set_dash_test_params(9, 7, extra_args=extra_args) self.set_dash_llmq_test_params(4, 3) def restart_mn(self, mn, reindex=False, qvvec_sync=None, qdata_recovery_enabled=True): diff --git a/test/functional/feature_llmq_dkgerrors.py b/test/functional/feature_llmq_dkgerrors.py index 762dfe09bb..cbf461e03c 100755 --- a/test/functional/feature_llmq_dkgerrors.py +++ b/test/functional/feature_llmq_dkgerrors.py @@ -14,7 +14,7 @@ Simulate and check DKG errors class LLMQDKGErrors(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(4, 3, [["-whitelist=127.0.0.1"]] * 4, fast_dip3_enforcement=True) + self.set_dash_test_params(4, 3, [["-whitelist=127.0.0.1"]] * 4) def run_test(self): self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0) diff --git a/test/functional/feature_llmq_evo.py b/test/functional/feature_llmq_evo.py index e3a95cea67..a26f385995 100755 --- a/test/functional/feature_llmq_evo.py +++ b/test/functional/feature_llmq_evo.py @@ -46,7 +46,7 @@ class TestP2PConn(P2PInterface): class LLMQEvoNodesTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(5, 4, fast_dip3_enforcement=True, evo_count=5) + self.set_dash_test_params(5, 4, evo_count=5) self.set_dash_llmq_test_params(4, 4) def run_test(self): diff --git a/test/functional/feature_llmq_is_cl_conflicts.py b/test/functional/feature_llmq_is_cl_conflicts.py index a6677bedb4..f7cf10cd13 100755 --- a/test/functional/feature_llmq_is_cl_conflicts.py +++ b/test/functional/feature_llmq_is_cl_conflicts.py @@ -49,7 +49,7 @@ class TestP2PConn(P2PInterface): class LLMQ_IS_CL_Conflicts(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(5, 4, fast_dip3_enforcement=True) + self.set_dash_test_params(5, 4) self.set_dash_llmq_test_params(4, 4) self.supports_cli = False diff --git a/test/functional/feature_llmq_is_retroactive.py b/test/functional/feature_llmq_is_retroactive.py index d4e5bb1429..f026091c84 100755 --- a/test/functional/feature_llmq_is_retroactive.py +++ b/test/functional/feature_llmq_is_retroactive.py @@ -22,7 +22,7 @@ from test_framework.util import set_node_times class LLMQ_IS_RetroactiveSigning(DashTestFramework): def set_test_params(self): # -whitelist is needed to avoid the trickling logic on node0 - self.set_dash_test_params(5, 4, [["-whitelist=127.0.0.1"], [], [], [], ["-minrelaytxfee=0.001"]], fast_dip3_enforcement=True) + self.set_dash_test_params(5, 4, [["-whitelist=127.0.0.1"], [], [], [], ["-minrelaytxfee=0.001"]]) def run_test(self): self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0) diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py index 7a93731269..04ad6bd40b 100755 --- a/test/functional/feature_llmq_rotation.py +++ b/test/functional/feature_llmq_rotation.py @@ -51,7 +51,7 @@ class TestP2PConn(P2PInterface): class LLMQQuorumRotationTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(9, 8, fast_dip3_enforcement=True) + self.set_dash_test_params(9, 8) self.set_dash_llmq_test_params(4, 4) def run_test(self): diff --git a/test/functional/feature_llmq_signing.py b/test/functional/feature_llmq_signing.py index 08edc8827f..8206e7dde4 100755 --- a/test/functional/feature_llmq_signing.py +++ b/test/functional/feature_llmq_signing.py @@ -18,7 +18,7 @@ from test_framework.util import assert_equal, assert_raises_rpc_error, force_fin class LLMQSigningTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(6, 5, fast_dip3_enforcement=True) + self.set_dash_test_params(6, 5) self.set_dash_llmq_test_params(5, 3) def add_options(self, parser): diff --git a/test/functional/feature_llmq_simplepose.py b/test/functional/feature_llmq_simplepose.py index 6ca819968a..b26b964fef 100755 --- a/test/functional/feature_llmq_simplepose.py +++ b/test/functional/feature_llmq_simplepose.py @@ -18,7 +18,7 @@ from test_framework.util import assert_equal, force_finish_mnsync, p2p_port class LLMQSimplePoSeTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(6, 5, fast_dip3_enforcement=True) + self.set_dash_test_params(6, 5) self.set_dash_llmq_test_params(5, 3) def run_test(self): diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py index cadbbbc2ca..17eab92f15 100755 --- a/test/functional/feature_mnehf.py +++ b/test/functional/feature_mnehf.py @@ -25,7 +25,7 @@ from test_framework.util import ( class MnehfTest(DashTestFramework): def set_test_params(self): extra_args = [["-vbparams=testdummy:0:999999999999:0:12:12:12:5:1", "-persistmempool=0"] for _ in range(4)] - self.set_dash_test_params(4, 3, fast_dip3_enforcement=True, extra_args=extra_args) + self.set_dash_test_params(4, 3, extra_args=extra_args) def skip_test_if_missing_module(self): self.skip_if_no_wallet() diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index 44957d0eec..5dee940fa5 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -27,7 +27,7 @@ def notify_outputname(walletname, txid): class NotificationsTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(6, 4, fast_dip3_enforcement=True) + self.set_dash_test_params(6, 4) def setup_network(self): self.wallet = ''.join(chr(i) for i in range(FILE_CHAR_START, FILE_CHAR_END) if chr(i) not in FILE_CHARS_DISALLOWED) diff --git a/test/functional/interface_zmq_dash.py b/test/functional/interface_zmq_dash.py index c0366d27ef..d5e2a9852a 100755 --- a/test/functional/interface_zmq_dash.py +++ b/test/functional/interface_zmq_dash.py @@ -108,7 +108,7 @@ class DashZMQTest (DashTestFramework): extra_args = [[]] * 5 extra_args[0] = node0_extra_args - self.set_dash_test_params(5, 4, fast_dip3_enforcement=True, extra_args=extra_args) + self.set_dash_test_params(5, 4, extra_args=extra_args) self.set_dash_llmq_test_params(4, 4) def skip_test_if_missing_module(self): diff --git a/test/functional/p2p_instantsend.py b/test/functional/p2p_instantsend.py index 044f869df9..d7dec82adb 100755 --- a/test/functional/p2p_instantsend.py +++ b/test/functional/p2p_instantsend.py @@ -14,7 +14,7 @@ Tests InstantSend functionality (prevent doublespend for unconfirmed transaction class InstantSendTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(8, 4, fast_dip3_enforcement=True) + self.set_dash_test_params(8, 4) # set sender, receiver, isolated nodes self.isolated_idx = 1 self.receiver_idx = 2 diff --git a/test/functional/p2p_quorum_data.py b/test/functional/p2p_quorum_data.py index 7257007f8a..e736b11871 100755 --- a/test/functional/p2p_quorum_data.py +++ b/test/functional/p2p_quorum_data.py @@ -118,7 +118,7 @@ class QuorumDataInterface(P2PInterface): class QuorumDataMessagesTest(DashTestFramework): def set_test_params(self): extra_args = [["-llmq-data-recovery=0", "-deprecatedrpc=banscore"]] * 4 - self.set_dash_test_params(4, 3, fast_dip3_enforcement=True, extra_args=extra_args) + self.set_dash_test_params(4, 3, extra_args=extra_args) def restart_mn(self, mn, reindex=False): args = self.extra_args[mn.node.index] + ['-masternodeblsprivkey=%s' % mn.keyOperator] diff --git a/test/functional/rpc_masternode.py b/test/functional/rpc_masternode.py index 30a4f10a07..158b8cbb67 100755 --- a/test/functional/rpc_masternode.py +++ b/test/functional/rpc_masternode.py @@ -13,7 +13,7 @@ Test "masternode" rpc subcommands class RPCMasternodeTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(4, 3, fast_dip3_enforcement=True) + self.set_dash_test_params(4, 3) def run_test(self): self.log.info("test that results from `winners` and `payments` RPCs match") diff --git a/test/functional/rpc_mnauth.py b/test/functional/rpc_mnauth.py index 09b4a7c2f9..253b7955db 100755 --- a/test/functional/rpc_mnauth.py +++ b/test/functional/rpc_mnauth.py @@ -17,7 +17,7 @@ Tests mnauth RPC command class FakeMNAUTHTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(2, 1, fast_dip3_enforcement=True) + self.set_dash_test_params(2, 1) def run_test(self): diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 1972a94984..9d6c47ce07 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -41,7 +41,7 @@ def assert_net_servicesnames(servicesflag, servicenames): class NetTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(3, 1, fast_dip3_enforcement=True) + self.set_dash_test_params(3, 1) self.supports_cli = False def run_test(self): diff --git a/test/functional/rpc_quorum.py b/test/functional/rpc_quorum.py index 80cd910624..e97b65c143 100755 --- a/test/functional/rpc_quorum.py +++ b/test/functional/rpc_quorum.py @@ -13,7 +13,7 @@ Test "quorum" rpc subcommands class RPCMasternodeTest(DashTestFramework): def set_test_params(self): - self.set_dash_test_params(4, 3, fast_dip3_enforcement=True) + self.set_dash_test_params(4, 3) def run_test(self): self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 0) diff --git a/test/functional/rpc_verifychainlock.py b/test/functional/rpc_verifychainlock.py index 4e3447048b..42d0559733 100755 --- a/test/functional/rpc_verifychainlock.py +++ b/test/functional/rpc_verifychainlock.py @@ -19,7 +19,7 @@ Test the following RPC: class RPCVerifyChainLockTest(DashTestFramework): def set_test_params(self): # -whitelist is needed to avoid the trickling logic on node0 - self.set_dash_test_params(5, 3, [["-whitelist=127.0.0.1"], [], [], [], []], fast_dip3_enforcement=True) + self.set_dash_test_params(5, 3, [["-whitelist=127.0.0.1"], [], [], [], []]) self.set_dash_llmq_test_params(3, 2) def cl_helper(self, height, chainlock, mempool): diff --git a/test/functional/rpc_verifyislock.py b/test/functional/rpc_verifyislock.py index 534bbe1c57..10309b6e58 100755 --- a/test/functional/rpc_verifyislock.py +++ b/test/functional/rpc_verifyislock.py @@ -17,7 +17,7 @@ Test verifyislock rpc class RPCVerifyISLockTest(DashTestFramework): def set_test_params(self): # -whitelist is needed to avoid the trickling logic on node0 - self.set_dash_test_params(6, 5, [["-whitelist=127.0.0.1"], [], [], [], [], []], fast_dip3_enforcement=True) + self.set_dash_test_params(6, 5, [["-whitelist=127.0.0.1"], [], [], [], [], []]) def get_request_id(self, tx_hex): tx = from_hex(CTransaction(), tx_hex) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index d94a17f56f..eebc89d266 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -1108,7 +1108,7 @@ class DashTestFramework(BitcoinTestFramework): if mn2.node is not None: mn2.node.setmnthreadactive(True) - def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, fast_dip3_enforcement=False, evo_count=0): + def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo_count=0): self.mn_count = masterodes_count self.evo_count = evo_count self.num_nodes = num_nodes @@ -1120,10 +1120,8 @@ class DashTestFramework(BitcoinTestFramework): assert_equal(len(extra_args), num_nodes) self.extra_args = [copy.deepcopy(a) for a in extra_args] self.extra_args[0] += ["-sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"] - self.fast_dip3_enforcement = fast_dip3_enforcement - if fast_dip3_enforcement: - for i in range(0, num_nodes): - self.extra_args[i].append("-dip3params=30:50") + for i in range(0, num_nodes): + self.extra_args[i].append("-dip3params=2:2") # LLMQ default test params (no need to pass -llmqtestparams) self.llmq_size = 3 @@ -1482,12 +1480,6 @@ class DashTestFramework(BitcoinTestFramework): self.bump_mocktime(1) self.nodes[0].generate(10) - self.log.info("Activating DIP3") - if not self.fast_dip3_enforcement: - while self.nodes[0].getblockcount() < 500: - self.nodes[0].generate(10) - self.sync_all() - # create masternodes self.prepare_masternodes() self.prepare_datadirs()