fix: activate dip0008 in feature_dip4_coinbasemerkleroots without extra blocks

knst · knst · commit 67eb2e452ec7 · 2025-04-22T17:27:15.000+07:00
It also remove custom helper
diff --git a/test/functional/feature_dip4_coinbasemerkleroots.py b/test/functional/feature_dip4_coinbasemerkleroots.py
@@ -253,17 +253,6 @@ def test_getmnlistdiff_base(self, baseBlockHash, blockHash):
 
         return d
 
-    def activate_dip8(self, slow_mode=False):
-        # NOTE: set slow_mode=True if you are activating dip8 after a huge reorg
-        # or nodes might fail to catch up otherwise due to a large
-        # (MAX_BLOCKS_IN_TRANSIT_PER_PEER = 16 blocks) reorg error.
-        self.log.info("Wait for dip0008 activation")
-        while self.nodes[0].getblockcount() < DIP0008_HEIGHT:
-            self.bump_mocktime(10)
-            self.generate(self.nodes[0], 10, sync_fun=self.no_op)
-            if slow_mode:
-                self.sync_blocks()
-        self.sync_blocks()
 
     def test_dip8_quorum_merkle_root_activation(self, with_initial_quorum, slow_mode=False):
         if with_initial_quorum:
@@ -279,7 +268,9 @@ def test_dip8_quorum_merkle_root_activation(self, with_initial_quorum, slow_mode
         cbtx = self.nodes[0].getblock(self.nodes[0].getbestblockhash(), 2)["tx"][0]
         assert cbtx["cbTx"]["version"] == 1
 
-        self.activate_dip8(slow_mode)
+        self.activate_by_name('dip0008', expected_activation_height=DIP0008_HEIGHT)
+        self.log.info("Mine one more block with new rules of dip0008")
+        self.generate(self.nodes[0], 1)
 
         # Assert that merkleRootQuorums is present and 0 (we have no quorums yet)
         cbtx = self.nodes[0].getblock(self.nodes[0].getbestblockhash(), 2)["tx"][0]
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -1206,7 +1206,7 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo
         self.quorum_data_request_expiration_timeout = 360
 
 
-    def activate_by_name(self, name, expected_activation_height=None):
+    def activate_by_name(self, name, expected_activation_height=None, slow_mode=True):
         assert not softfork_active(self.nodes[0], name)
         self.log.info("Wait for " + name + " activation")
 
@@ -1217,7 +1217,7 @@ def activate_by_name(self, name, expected_activation_height=None):
         self.wait_for_sporks_same()
 
         # mine blocks in batches
-        batch_size = 50
+        batch_size = 50 if not slow_mode else 10
         if expected_activation_height is not None:
             height = self.nodes[0].getblockcount()
             assert height < expected_activation_height
