Skip to content

Commit cf84dff

Browse files
committed
fix: bump time for all nodes during mine_quorum in feature_llmq_rotation.py test
1 parent efd4701 commit cf84dff

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

test/functional/feature_llmq_rotation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ def move_to_next_cycle(self):
389389
# move forward to next DKG
390390
skip_count = cycle_length - (cur_block % cycle_length)
391391
if skip_count != 0:
392-
self.bump_mocktime(1, nodes=nodes)
392+
self.bump_mocktime(1)
393393
self.generate(self.nodes[0], skip_count, sync_fun=self.no_op)
394394
self.sync_blocks(nodes)
395395
self.log.info('Moved from block %d to %d' % (cur_block, self.nodes[0].getblockcount()))

test/functional/test_framework/test_framework.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,17 +1836,17 @@ def mine_quorum(self, llmq_type_name="llmq_test", llmq_type=100, expected_connec
18361836
# move forward to next DKG
18371837
skip_count = 24 - (self.nodes[0].getblockcount() % 24)
18381838
if skip_count != 0:
1839-
self.bump_mocktime(1, nodes=nodes)
1839+
self.bump_mocktime(1)
18401840
self.generate(self.nodes[0], skip_count, sync_fun=self.no_op)
18411841
self.sync_blocks(nodes)
18421842

18431843
q = self.nodes[0].getbestblockhash()
18441844
self.log.info("Expected quorum_hash:"+str(q))
18451845
self.log.info("Waiting for phase 1 (init)")
18461846
self.wait_for_quorum_phase(q, 1, expected_members, None, 0, mninfos_online, llmq_type_name=llmq_type_name)
1847-
self.wait_for_quorum_connections(q, expected_connections, mninfos_online, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes), llmq_type_name=llmq_type_name)
1847+
self.wait_for_quorum_connections(q, expected_connections, mninfos_online, wait_proc=lambda: self.bump_mocktime(1), llmq_type_name=llmq_type_name)
18481848
if spork23_active:
1849-
self.wait_for_masternode_probes(q, mninfos_online, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes))
1849+
self.wait_for_masternode_probes(q, mninfos_online, wait_proc=lambda: self.bump_mocktime(1))
18501850

18511851
self.move_blocks(nodes, 2)
18521852

@@ -1877,7 +1877,7 @@ def mine_quorum(self, llmq_type_name="llmq_test", llmq_type=100, expected_connec
18771877
self.wait_for_quorum_commitment(q, nodes, llmq_type=llmq_type)
18781878

18791879
self.log.info("Mining final commitment")
1880-
self.bump_mocktime(1, nodes=nodes)
1880+
self.bump_mocktime(1)
18811881
self.nodes[0].getblocktemplate() # this calls CreateNewBlock
18821882
self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(nodes))
18831883

@@ -1928,9 +1928,9 @@ def mine_cycle_quorum(self, is_first=True):
19281928
self.log.info("quorumIndex 0: Waiting for phase 1 (init)")
19291929
self.wait_for_quorum_phase(q_0, 1, expected_members, None, 0, mninfos_online, llmq_type_name)
19301930
self.log.info("quorumIndex 0: Waiting for quorum connections (init)")
1931-
self.wait_for_quorum_connections(q_0, expected_connections, mninfos_online, llmq_type_name, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes))
1931+
self.wait_for_quorum_connections(q_0, expected_connections, mninfos_online, llmq_type_name, wait_proc=lambda: self.bump_mocktime(1))
19321932
if spork23_active:
1933-
self.wait_for_masternode_probes(q_0, mninfos_online, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes), llmq_type_name=llmq_type_name)
1933+
self.wait_for_masternode_probes(q_0, mninfos_online, wait_proc=lambda: self.bump_mocktime(1), llmq_type_name=llmq_type_name)
19341934

19351935
self.move_blocks(nodes, 1)
19361936

@@ -1940,9 +1940,9 @@ def mine_cycle_quorum(self, is_first=True):
19401940
self.log.info("quorumIndex 1: Waiting for phase 1 (init)")
19411941
self.wait_for_quorum_phase(q_1, 1, expected_members, None, 0, mninfos_online, llmq_type_name)
19421942
self.log.info("quorumIndex 1: Waiting for quorum connections (init)")
1943-
self.wait_for_quorum_connections(q_1, expected_connections, mninfos_online, llmq_type_name, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes))
1943+
self.wait_for_quorum_connections(q_1, expected_connections, mninfos_online, llmq_type_name, wait_proc=lambda: self.bump_mocktime(1))
19441944
if spork23_active:
1945-
self.wait_for_masternode_probes(q_1, mninfos_online, wait_proc=lambda: self.bump_mocktime(1, nodes=nodes), llmq_type_name=llmq_type_name)
1945+
self.wait_for_masternode_probes(q_1, mninfos_online, wait_proc=lambda: self.bump_mocktime(1), llmq_type_name=llmq_type_name)
19461946

19471947
self.move_blocks(nodes, 1)
19481948

@@ -1994,7 +1994,7 @@ def mine_cycle_quorum(self, is_first=True):
19941994
self.log.info("quorumIndex 1: Waiting for phase 6 (finalization)")
19951995
self.wait_for_quorum_phase(q_1, 6, expected_members, None, 0, mninfos_online, llmq_type_name)
19961996
self.log.info("Mining final commitments")
1997-
self.bump_mocktime(1, nodes=nodes)
1997+
self.bump_mocktime(1)
19981998
self.nodes[0].getblocktemplate() # this calls CreateNewBlock
19991999
self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(nodes))
20002000

0 commit comments

Comments
 (0)