test(e2e): dedupe multi-node block-production and governance test setups - #24498
Merged
Conversation
Repoint block-production/blob_promotion and recovery/pipeline_prune onto the shared setupBlockProductionWithProver helper (new mockGossipSubNetworkLatency / maxTxsPerCheckpoint / clearInheritedCoinbase / disableCheckpointPromotionOnFirstNode options), extract a shared governance round-driving driver (createGovernanceTestDriver + driveGovernanceRound) adopted by add_rollup and upgrade_governance_proposer, and hoist the invalidate_block attack configs into a typed file-local table. Pure dedup refactor: no timing/config values change.
PhilWindle
approved these changes
Jul 5, 2026
rangozd
pushed a commit
to rangozd/aztec-packages
that referenced
this pull request
Aug 5, 2026
Clean forward-port of AztecProtocol#24524 (merge-train spartan-v5, merge commit f397aa5, parents aba2a2e..7e7d8d0) onto cb/private-port-next-7. Cherry-pick -m 1 applied with zero conflicts; resulting tree touches exactly the 152 files of the source merge diff. Pure TS/docs/CI (117 e2e-consolidation test files + sequencer-client, archiver, stdlib TS, p2p, ethereum, validator-client, foundation, docs, .test_patterns.yml). No noir/circuit/pinned-artifact surfaces → no standard-contracts regen. Bundles sub-PRs AztecProtocol#24504 AztecProtocol#24506 AztecProtocol#24507 AztecProtocol#24509 AztecProtocol#24513 AztecProtocol#24515 AztecProtocol#24474 AztecProtocol#24489 AztecProtocol#24490 AztecProtocol#24491 AztecProtocol#24492 AztecProtocol#24494 AztecProtocol#24495 AztecProtocol#24498 AztecProtocol#24500 AztecProtocol#24503 AztecProtocol#24475. Tracker: AztecProtocol/aztec-packages-private#570
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Round-2 e2e consolidation, PR 7 of 9. Pure dedup/refactor of multi-node test setups — no timing or config values change; every asserted behavior is preserved.
What changed
block-production/blob_promotion + recovery/pipeline_prune → shared
setupBlockProductionWithProver. Both files reimplemented the same 4-validator + prover +WIDE_SLOT_TIMING+mockGossipSubNetworkLatency: 500cluster locally (setupBlobPromotion/setupTest). Those local helpers are deleted and both now call the shared helper, which gained four opt-in options:mockGossipSubNetworkLatency,maxTxsPerCheckpoint,clearInheritedCoinbase(per-attester coinbase), anddisableCheckpointPromotionOnFirstNode.buildValidatorClusternow accepts a per-indexnodeOptsfunction so node 0 can be configured distinctly. The resolved setup options and per-node config are identical to the originals (same keys/values; existing callerscross_chain_messages/deploy_and_call_ordering/proposed_chainare unaffected because both new booleans default to false). One benign side effect: pipeline_prune now also installswatchNodeSequencerEventsvia the helper — instrumentation only, no assertions consume it. (recovery → block-production cross-directory import, as permitted by the plan.)governance mechanics dedup. Extracted
createGovernanceTestDriver+driveGovernanceRoundintogovernance/setup.ts, wrapping thegovInfo/ round-boundary warp / quorum wait / submit-winner / vote-through-delays mechanics duplicated byadd_rollupandupgrade_governance_proposer. Both files adopt it; their scenario-specific parts (payload construction, node signaling, node migration + bridging in add_rollup, pre/post-execute assertions) stay in place. Each caller passes its own quorum timeout (upgrade:quorumSize * aztecSlotDuration * 3;add_rollup:600) so no timing value changes. The vote-success assertion now lives in the driver and covers both callers.Dropped assertions
None. The
upgrade_governance_proposervote-success assertion is preserved (moved into the driver'svoteToExecutable, where it now also coversadd_rollup).Local test runs (all pass)
upgrade_governance_proposer— 1 passed (116s)block-production/blob_promotion— 1 passed (293s)recovery/pipeline_prune— 1 passed (367s)governance/add_rollup— 1 passed (327s locally); also green in CI.