Skip to content

test: fix flaky TestLedgerBlockHeaders UpgradeState check #6382

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

Merged
gmalouf merged 1 commit into from
Jul 15, 2025
Merged

test: fix flaky TestLedgerBlockHeaders UpgradeState check #6382

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
10 changes: 9 additions & 1 deletion ledger/ledger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,17 @@ func TestLedgerBlockHeaders(t *testing.T) {
}
a.NotEmpty(wrongVersion)
badBlock.BlockHeader.CurrentProtocol = wrongVersion
if !config.Consensus[wrongVersion].EnableSha512BlockHash {
// Handle Branch512 field mismatch between correctHeader and wrongVersion's expectations
// We want to set the Branch512 header to match wrongVersion so that PreCheck will reach
// the intended "UpgradeState mismatch" error, which happens after the Branch512 check.
if !proto.EnableSha512BlockHash && config.Consensus[wrongVersion].EnableSha512BlockHash {
// correctHeader has empty Branch512, but wrongVersion expects it during validation
badBlock.BlockHeader.Branch512 = lastBlock.Hash512()
} else if proto.EnableSha512BlockHash && !config.Consensus[wrongVersion].EnableSha512BlockHash {
Comment thread
cce marked this conversation as resolved.
Comment thread
cce marked this conversation as resolved.
// correctHeader has non-zero Branch512, but wrongVersion doesn't support it
badBlock.BlockHeader.Branch512 = crypto.Sha512Digest{}
}
// Otherwise, Branch512 is already correct (both support or both don't support SHA512)
a.ErrorContains(l.appendUnvalidated(badBlock), "UpgradeState mismatch")

badBlock = bookkeeping.Block{BlockHeader: correctHeader}
Expand Down
Loading