Skip to content
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

fix: adjust LLMQ_TEST_DIP0024 params, mine_cycle_quorum should use correct size #5655

Merged
merged 2 commits into from
Oct 30, 2023
Merged

fix: adjust LLMQ_TEST_DIP0024 params, mine_cycle_quorum should use correct size #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45cf172
fix: bump LLMQ_TEST_DIP0024 threshold to 3 (75%) to better match mainnet
UdjinM6 Oct 29, 2023
21c6f0c
fix: mine_cycle_quorum should use correct quorum size
UdjinM6 Oct 29, 2023
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
4 changes: 2 additions & 2 deletions src/llmq/params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ enum class LLMQType : uint8_t {
LLMQ_TEST_V17 = 102, // 3 members, 2 (66%) threshold, one per hour. Params might differ when -llmqtestparams is used

// for testing only
LLMQ_TEST_DIP0024 = 103, // 4 members, 2 (66%) threshold, one per hour. Params might differ when -llmqtestparams is used
LLMQ_TEST_DIP0024 = 103, // 4 members, 3 (75%) threshold, one per hour.
LLMQ_TEST_INSTANTSEND = 104, // 3 members, 2 (66%) threshold, one per hour. Params might differ when -llmqtestinstantsendparams is used
LLMQ_TEST_PLATFORM = 106, // 3 members, 2 (66%) threshold, one per hour.

Expand Down Expand Up @@ -202,7 +202,7 @@ static constexpr std::array<LLMQParams, 14> available_llmqs = {
.useRotation = true,
.size = 4,
.minSize = 4,
.threshold = 2,
Copy link
Member

@PastaPastaPasta PastaPastaPasta Oct 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a breaking change on devnet that should be documented (at least in PR description) no? Honestly would probably prefer "release-notes" file even though this probably wouldn't make it into final release notes.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a regtest-only quorum

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LLMQ type is used only on regtest. The one for devnet is: LLMQ_DEVNET_DIP0024

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good 👍

.threshold = 3,

.dkgInterval = 24, // DKG cycle
.dkgPhaseBlocks = 2,
Expand Down
9 changes: 5 additions & 4 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 @@ -1047,6 +1047,7 @@ def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, fas
# LLMQ default test params (no need to pass -llmqtestparams)
self.llmq_size = 3
self.llmq_threshold = 2
self.llmq_size_dip0024 = 4

# This is nRequestTimeout in dash-q-recovery thread
self.quorum_data_thread_request_timeout_seconds = 10
Expand Down Expand Up @@ -1813,13 +1814,13 @@ def mine_cycle_quorum(self, llmq_type_name="llmq_test_dip0024", llmq_type=103,
spork23_active = self.nodes[0].spork('show')['SPORK_23_QUORUM_POSE'] <= 1

if expected_connections is None:
expected_connections = (self.llmq_size - 1) if spork21_active else 2
expected_connections = (self.llmq_size_dip0024 - 1) if spork21_active else 2
if expected_members is None:
expected_members = self.llmq_size
expected_members = self.llmq_size_dip0024
if expected_contributions is None:
expected_contributions = self.llmq_size
expected_contributions = self.llmq_size_dip0024
if expected_commitments is None:
expected_commitments = self.llmq_size
expected_commitments = self.llmq_size_dip0024
if mninfos_online is None:
mninfos_online = self.mninfo.copy()
if mninfos_valid is None:
Expand Down
Loading