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

[1.0.1] Small improvements left in PR 715 #735

Merged
merged 4 commits into from
Sep 10, 2024
Merged

[1.0.1] Small improvements left in PR 715 #735

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98683f4
Make return type matched with declared function type so compiler retu…
linh2931 Sep 10, 2024
f8f066d
Only do to_qc_claim() conversion inside dlog() to avoid unnecesary co…
linh2931 Sep 10, 2024
40044af
Change strictness to strength about QC claim in a comment
linh2931 Sep 10, 2024
4de8aa3
Change exception type from invalid_qc_claim to block_validate_excepti…
linh2931 Sep 10, 2024
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
5 changes: 2 additions & 3 deletions libraries/chain/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3967,7 +3967,7 @@ struct controller_impl {
"QC is_strong (${s1}) in block extension does not match is_strong_qc (${s2}) in header extension. Block number: ${b}",
("s1", qc_proof.is_strong())("s2", new_qc_claim.is_strong_qc)("b", block_num) );

return qc_proof;
return std::optional{qc_proof};
}

// verify legacy block invariants
Expand Down Expand Up @@ -4098,10 +4098,9 @@ struct controller_impl {
if (qc) {
verify_qc(b, prev, *qc);

const auto qc_claim = qc->to_qc_claim();
dlog("received block: #${bn} ${t} ${prod} ${id}, qc claim: ${qc_claim}, previous: ${p}",
("bn", b->block_num())("t", b->timestamp)("prod", b->producer)("id", id)
("qc_claim", qc_claim)("p", b->previous));
("qc_claim", qc->to_qc_claim())("p", b->previous));
}
}

Expand Down