Skip to content

tests: fix concurrent accout commits in TestLedgerVerifiesOldStateProofs #6060

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
algorandskiy merged 1 commit into from
Jul 10, 2024
Merged

tests: fix concurrent accout commits in TestLedgerVerifiesOldStateProofs #6060

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
13 changes: 11 additions & 2 deletions ledger/ledger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,6 +1683,15 @@ func TestLedgerVerifiesOldStateProofs(t *testing.T) {
backlogPool := execpool.MakeBacklog(nil, 0, execpool.LowPriority, nil)
defer backlogPool.Shutdown()

// wait all pending commits to finish
l.trackers.accountsWriting.Wait()

// quit the commitSyncer goroutine: this test flushes manually with triggerTrackerFlush
l.trackers.ctxCancel()
l.trackers.ctxCancel = nil
<-l.trackers.commitSyncerClosed
l.trackers.commitSyncerClosed = nil

triggerTrackerFlush(t, l)
l.WaitForCommit(l.Latest())
blk := createBlkWithStateproof(t, maxBlocks, proto, genesisInitState, l, accounts)
Expand Down Expand Up @@ -1714,7 +1723,7 @@ func TestLedgerVerifiesOldStateProofs(t *testing.T) {
}
l.acctsOnline.voters.votersMu.Unlock()

// However, we are still able to very a state proof sicne we use the tracker
// However, we are still able to very a state proof since we use the tracker
blk = createBlkWithStateproof(t, maxBlocks, proto, genesisInitState, l, accounts)
_, err = l.Validate(context.Background(), blk, backlogPool)
require.ErrorContains(t, err, "state proof crypto error")
Expand Down Expand Up @@ -2934,7 +2943,7 @@ func testVotersReloadFromDiskAfterOneStateProofCommitted(t *testing.T, cfg confi
// wait all pending commits to finish
l.trackers.accountsWriting.Wait()

// quit the commitSyncer goroutine
// quit the commitSyncer goroutine: this test flushes manually with triggerTrackerFlush
l.trackers.ctxCancel()
l.trackers.ctxCancel = nil
<-l.trackers.commitSyncerClosed
Expand Down