Skip to content

test(world-state): make delayed-close fork queue-cleanup wait deterministic #24106

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
PhilWindle merged 1 commit into from
Jun 15, 2026
Merged

test(world-state): make delayed-close fork queue-cleanup wait deterministic #24106

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
7 changes: 5 additions & 2 deletions yarn-project/world-state/src/native/native_world_state.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { timesAsync } from '@aztec/foundation/collection';
import { randomBytes } from '@aztec/foundation/crypto/random';
import { Fr } from '@aztec/foundation/curves/bn254';
import { EthAddress } from '@aztec/foundation/eth-address';
import { sleep } from '@aztec/foundation/sleep';
import { retryUntil } from '@aztec/foundation/retry';
import type { SiblingPath } from '@aztec/foundation/trees';
import { PublicDataWrite } from '@aztec/stdlib/avm';
import { L2Block } from '@aztec/stdlib/block';
Expand Down Expand Up @@ -960,7 +960,10 @@ describe('NativeWorldState', () => {
await ws.unwindBlocks(BlockNumber.fromBigInt(2n));
await expect(delayedFork.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, 0n)).rejects.toThrow('Fork not found');

await sleep(closeDelayMs * 3);
// The delayed close fires after closeDelayMs and then asynchronously deletes the per-fork queue entry
// once its DELETE_FORK round-trip settles. Under a loaded CI grind that cleanup can take longer than a
// fixed sleep, so wait for it deterministically instead of racing closeDelayMs * 3.
await retryUntil(() => !(ws as any).instance.queues.has(forkId), 'delayed-close fork queue cleanup', 30, 0.1);

expect(warnSpy).not.toHaveBeenCalled();
expect((ws as any).instance.queues.has(forkId)).toBe(false);
Expand Down
Loading