Skip to content

test: extend v19 spork sync wait #7327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thepastaclaw wants to merge 1 commit into from
+4 −4
Closed

test: extend v19 spork sync wait #7327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/functional/feature_dip3_v19.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def run_test(self):

self.mine_quorum(llmq_type_name='llmq_test', llmq_type=100)

self.activate_by_name('v19', expected_activation_height=200)
self.activate_by_name('v19', expected_activation_height=200, spork_sync_timeout=60)
self.log.info("Activated v19 at height:" + str(self.nodes[0].getblockcount()))

mn_list_after = self.nodes[0].masternodelist()
Expand Down
6 changes: 3 additions & 3 deletions test/functional/test_framework/test_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,15 +1552,15 @@ def delay_v20_and_mn_rr(self, height=None):
self.v20_height = height
self.mn_rr_height = height

def activate_by_name(self, name, expected_activation_height=None, slow_mode=True):
def activate_by_name(self, name, expected_activation_height=None, slow_mode=True, spork_sync_timeout=30):
assert not softfork_active(self.nodes[0], name)
self.log.info("Wait for " + name + " activation")

# disable spork17 while mining blocks to activate "name" to prevent accidental quorum formation
spork17_value = self.nodes[0].spork('show')['SPORK_17_QUORUM_DKG_ENABLED']
self.bump_mocktime(1)
self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", 4070908800)
self.wait_for_sporks_same()
self.wait_for_sporks_same(timeout=spork_sync_timeout)

# mine blocks in batches
batch_size = 50 if not slow_mode else 10
Expand Down Expand Up @@ -1591,7 +1591,7 @@ def activate_by_name(self, name, expected_activation_height=None, slow_mode=True
# revert spork17 changes
self.bump_mocktime(1)
self.nodes[0].sporkupdate("SPORK_17_QUORUM_DKG_ENABLED", spork17_value)
self.wait_for_sporks_same()
self.wait_for_sporks_same(timeout=spork_sync_timeout)

def activate_v20(self, expected_activation_height=None):
self.activate_by_name('v20', expected_activation_height)
Expand Down
Loading