Skip to content

chore: Speed up and deflake sentinel test #13078

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
spalladino merged 1 commit into from
Mar 27, 2025
Merged

chore: Speed up and deflake sentinel test #13078

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
29 changes: 19 additions & 10 deletions yarn-project/end-to-end/src/e2e_p2p/validators_sentinel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ describe('e2e_p2p_validators_sentinel', () => {

// Wait for a few blocks to be mined
const currentBlock = t.monitor.l2BlockNumber;
const blockCount = NUM_VALIDATORS * 2;
const timeout = SHORTENED_BLOCK_TIME_CONFIG.aztecSlotDuration * blockCount * 2 + 20;
const blockCount = 3;
const timeout = SHORTENED_BLOCK_TIME_CONFIG.aztecSlotDuration * blockCount * 8;
t.logger.info(`Waiting until L2 block ${currentBlock + blockCount}`, { currentBlock, blockCount, timeout });
await retryUntil(() => t.monitor.l2BlockNumber >= currentBlock + blockCount, 'blocks mined', timeout);

Expand All @@ -86,13 +86,22 @@ describe('e2e_p2p_validators_sentinel', () => {
expect(offlineStats.missedAttestations.rate).toEqual(1);
expect(offlineStats.missedProposals.rate).toBeOneOf([1, NaN]);

// Check stats for a working validator
const okValidator = t.validators[0].attester.toLowerCase();
const okStats = stats.stats[okValidator];
t.logger.info(`Asserting stats for ok validator ${okValidator}`);
expect(okStats.history.length).toBeGreaterThanOrEqual(blockCount - 1);
expect(okStats.history.some(h => h.status === 'attestation-sent')).toBeTrue();
expect(okStats.history.some(h => h.status === 'block-mined' || 'block-proposed')).toBeTrue();
expect(okStats.missedAttestations.rate).toBeLessThan(1);
// Check stats for a validator that mined a block
const [proposerValidator, proposerStats] = Object.entries(stats.stats).find(([_, v]) =>
v?.history?.some(h => h.status === 'block-mined'),
)!;
t.logger.info(`Asserting stats for proposer validator ${proposerValidator}`);
expect(t.validators.map(v => v.attester.toLowerCase())).toContain(proposerValidator);
expect(proposerStats.history.length).toBeGreaterThanOrEqual(blockCount - 1);
expect(proposerStats.missedProposals.rate).toBeLessThan(1);

// Check stats for a validator that attested to a block
const [attestorValidator, attestorStats] = Object.entries(stats.stats).find(([_, v]) =>
v?.history?.some(h => h.status === 'attestation-sent'),
)!;
t.logger.info(`Asserting stats for attestor validator ${attestorValidator}`);
expect(t.validators.map(v => v.attester.toLowerCase())).toContain(attestorValidator);
expect(attestorStats.history.length).toBeGreaterThanOrEqual(blockCount - 1);
expect(attestorStats.missedAttestations.rate).toBeLessThan(1);
});
});