suggestions

UdjinM6 · UdjinM6 · commit 208b4aa0d258 · 2023-11-03T18:47:27.000+03:00
diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py
@@ -98,8 +98,8 @@ def run_test(self):
         quorumList = self.test_getmnlistdiff_quorums(b_h_0, b_h_1, {}, expectedDeleted, expectedNew, testQuorumsCLSigs=False)
 
         self.log.info(f"Wait for v20 locked_in phase")
-        # Expected locked_in phase starts at 1440 - 480 (window size in regtest) + 1
-        projected_activation_height = self.advance_to_locked_in_for_v20(expected_locked_in_height=961)
+        # Expected locked_in phase starts at 1440 - 480 (window size in regtest)
+        projected_activation_height = self.advance_to_locked_in_for_v20(expected_locked_in_height=960)
 
         self.activate_v20(expected_activation_height=1440)
         self.log.info("Activated v20 at height:" + str(self.nodes[0].getblockcount()))
@@ -388,19 +388,31 @@ def advance_to_locked_in_for_v20(self, expected_locked_in_height):
         batch_size = 10
         height = self.nodes[0].getblockcount()
         assert_greater_than(expected_locked_in_height, height)
-        while expected_locked_in_height - height >= batch_size:
+        # NOTE: getblockchaininfo shows softforks locked_in at block (window * 2 - 1)
+        # since it's returning whether a softwork is locked_in for the _next_ block.
+        # Hence the last block prior to the locked_in state is (expected_locked_in_height - 2).
+        while expected_locked_in_height - height - 2 >= batch_size:
             self.bump_mocktime(batch_size)
             self.nodes[0].generate(batch_size)
             height += batch_size
             self.sync_blocks()
-        blocks_left = expected_locked_in_height - height
+        blocks_left = expected_locked_in_height - height - 2
         assert_greater_than(batch_size, blocks_left)
         self.bump_mocktime(blocks_left)
         self.nodes[0].generate(blocks_left)
         self.sync_blocks()
 
+        softfork_info = get_bip9_details(self.nodes[0], 'v20')
+        assert_equal(softfork_info['status'], 'started')
+        assert 'activation_height' not in softfork_info
+
+        self.bump_mocktime(1)
+        self.nodes[0].generate(1)
+        self.sync_blocks()
+
         softfork_info = get_bip9_details(self.nodes[0], 'v20')
         assert_equal(softfork_info['status'], 'locked_in')
+        assert_equal(softfork_info['since'], expected_locked_in_height)
         assert 'activation_height' in softfork_info
         projected_activation_height = softfork_info['activation_height']
 
