IF: Unification: Implement get_best_qc in block_state #2076
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greg7mdp
requested changes
Jan 11, 2024
libraries/chain/block_state.cpp
Outdated
Comment on lines
112
to
113
| return qc_data_t{ quorum_certificate{ block_number, valid_qc.value() }, | ||
| qc_info_t{ block_number, valid_qc.value().is_strong() }}; |
There was a problem hiding this comment.
Suggested change
| return qc_data_t{ quorum_certificate{ block_number, valid_qc.value() }, | |
| qc_info_t{ block_number, valid_qc.value().is_strong() }}; | |
| return qc_data_t{ quorum_certificate{ block_number, *valid_qc }, | |
| qc_info_t{ block_number, valid_qc->is_strong() }}; |
libraries/chain/block_state.cpp
Outdated
Comment on lines
131
to
138
| if( valid_qc.value().is_strong() && !valid_qc_from_pending.is_strong() ) { | ||
| valid_qc_is_better = true; | ||
| } else if( !valid_qc.value().is_strong() && valid_qc_from_pending.is_strong() ) { | ||
| valid_qc_is_better = false; | ||
| } else if( valid_qc.value().accumulated_weight() >= valid_qc_from_pending.accumulated_weight() ) { | ||
| valid_qc_is_better = true; | ||
| } else { | ||
| valid_qc_is_better = false; |
There was a problem hiding this comment.
For modularity, I believe it would be better to have a comparison operator in valid_quorum_certificate, such as:
bool operator<(const valid_quorum_certificate& o) const {
if (is_strong() != o.is_strong())
return o.is_strong();
if (accumulated_weight() != o.accumulated_weight())
return accumulated_weight() < o.accumulated_weight();
return false;
}and then get_best_qc can return std::max(*valid_qc, valid_qc_from_pending).
arhag
requested changes
Jan 12, 2024
…ccumulated_weight from valid_quorum_certificate
arhag
approved these changes
Jan 16, 2024
greg7mdp
approved these changes
Jan 16, 2024
|
Note:start |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
pending_qcdoes not have a valid QC, return valid_qc. Otherwise, extract the valid QC frompending_qc. Compare that tovalid_qcto determine which is better: Strong beats Weak. Break tie withvalid_qc. Return the better one.Resolved #2075