Skip to content

chore(devstack): remove NewMultiSupervisorInterop preset and dead code#20848

Merged
ajsutton merged 4 commits into
developfrom
aj/chore/remove-multisupervisor-preset
May 19, 2026
Merged

chore(devstack): remove NewMultiSupervisorInterop preset and dead code#20848
ajsutton merged 4 commits into
developfrom
aj/chore/remove-multisupervisor-preset

Conversation

@ajsutton
Copy link
Copy Markdown
Contributor

@ajsutton ajsutton commented May 18, 2026

The MultiSupervisorInterop preset only existed because op-supervisor did not support multi-node and so verifier nodes needed a second supervisor. The supernode-based presets cover the same ground, and the one test that consumed this preset (TestL2CLAheadOfSupervisor and friends) was gt.Skip(...)-gated.

After PR #20825, this was the last test outside op-supervisor/ that actually started an op-supervisor service. Removing it (plus the duplicated op-devstack example tests) removes the last non-op-supervisor/ op-supervisor lifecycle dependency for the supernode path.

Changes:

  • Delete op-acceptance-tests/tests/interop/sync/multisupervisor_interop/.
  • Delete op-devstack/example/example_test.go (covered by the kona-supervisor integration tests).
  • Drop NewMultiSupervisorInterop / MultiSupervisorInterop and multiSupervisorInteropFromRuntime / NewMultiSupervisorInteropRuntime.
  • Drop the now-unused MultiChainRuntime.SecondarySupervisor field.
  • Drop dsl.Supervisor helpers used only by the removed tests: AwaitMinL1, AwaitMinCrossSafeTimestamp, AdvancedSafeHead, AddManagedL2CL, VerifySyncStatus (and its options).
  • Update the acceptance-tests README example to point at a live test.

ajsutton added 2 commits May 19, 2026 08:39
The MultiSupervisorInterop preset existed only to give verifier nodes a
second op-supervisor because op-supervisor did not support multi-node.
The supernode-based presets cover the same scenarios now, and the only
test that consumed this preset (interop_sync_test.go) was skipped at
runtime.

- Delete op-acceptance-tests/tests/interop/sync/multisupervisor_interop
- Drop NewMultiSupervisorInterop / MultiSupervisorInterop and the
  multiSupervisorInteropFromRuntime / NewMultiSupervisorInteropRuntime
  factories.
- Drop the now-unused MultiChainRuntime.SecondarySupervisor field.
- Update the README example to point at a live test.
AwaitMinL1, AwaitMinCrossSafeTimestamp, AdvancedSafeHead, and
AddManagedL2CL on dsl.Supervisor were only consumed by the deleted
multi-supervisor interop test.
@ajsutton ajsutton requested a review from a team as a code owner May 18, 2026 22:42
ajsutton added 2 commits May 19, 2026 08:57
The op-devstack example tests were duplicated by the kona-supervisor
integration tests, and were the only consumers of the dsl.Supervisor
VerifySyncStatus helpers.
@ajsutton ajsutton enabled auto-merge May 18, 2026 23:17
@ajsutton ajsutton added this pull request to the merge queue May 18, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 19, 2026
@ajsutton ajsutton added this pull request to the merge queue May 19, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 19, 2026
@ajsutton ajsutton added this pull request to the merge queue May 19, 2026
Merged via the queue into develop with commit 908d9c2 May 19, 2026
66 checks passed
@ajsutton ajsutton deleted the aj/chore/remove-multisupervisor-preset branch May 19, 2026 01:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants