Skip to content

chore(devstack): remove rust/kona/tests/supervisor and the sysgo op-supervisor path #20849

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
wwared merged 3 commits into from
May 19, 2026
Merged

chore(devstack): remove rust/kona/tests/supervisor and the sysgo op-supervisor path #20849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b936f3
chore: remove rust/kona/tests/supervisor and the sysgo op-supervisor …
ajsutton May 18, 2026
ac00a0b
chore(devstack): rename SupernodeProofs interop factories to drop suffix
ajsutton May 18, 2026
b7ad11f
chore: drop unused buildTwoL2WorldWithState
ajsutton May 19, 2026
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
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/interop/proofs-singlechain/interop_fault_proofs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ import (

func TestInteropSingleChainFaultProofs(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSingleChainInteropSupernodeProofs(t)
sys := presets.NewSingleChainInterop(t)
sfp.RunSingleChainSuperFaultProofSmokeTest(t, sys)
}
8 changes: 4 additions & 4 deletions op-acceptance-tests/tests/interop/proofs/challenger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func TestChallengerPlaysGame(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithoutHonestProposer())
sys := presets.NewSimpleInterop(t, presets.WithoutHonestProposer())
dsl.CheckAll(t,
sys.L2CLA.AdvancedFn(types.CrossSafe, 1, 30),
sys.L2CLB.AdvancedFn(types.CrossSafe, 1, 30),
Expand All @@ -38,7 +38,7 @@ func TestChallengerPlaysGame(gt *testing.T) {

func TestChallengerRespondsToMultipleInvalidClaims(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithoutHonestProposer())
sys := presets.NewSimpleInterop(t, presets.WithoutHonestProposer())
dsl.CheckAll(t,
sys.L2CLA.AdvancedFn(types.CrossSafe, 1, 30),
sys.L2CLB.AdvancedFn(types.CrossSafe, 1, 30),
Expand All @@ -61,7 +61,7 @@ func TestChallengerRespondsToMultipleInvalidClaims(gt *testing.T) {

func TestChallengerRespondsToMultipleInvalidClaimsEOA(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithoutHonestProposer())
sys := presets.NewSimpleInterop(t, presets.WithoutHonestProposer())
dsl.CheckAll(t,
sys.L2CLA.AdvancedFn(types.CrossSafe, 1, 30),
sys.L2CLB.AdvancedFn(types.CrossSafe, 1, 30),
Expand All @@ -87,7 +87,7 @@ func TestChallengerRespondsToMultipleInvalidClaimsEOA(gt *testing.T) {

func TestChallengerCountersPreGenesisGame(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(
sys := presets.NewSimpleInterop(
t,
presets.WithPreGenesisSuperGame(
eth.Bytes32(common.HexToHash("0x1111000000000000000000000000000000000000000000000000000000000000")),
Expand Down
4 changes: 2 additions & 2 deletions op-acceptance-tests/tests/interop/proofs/fpp/fpp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

func TestFPP(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)

startTimestamp := max(sys.L2ChainA.Escape().RollupConfig().TimestampForBlock(1), sys.L2ChainB.Escape().RollupConfig().TimestampForBlock(1))
endTimestamp := sys.L2ChainA.Escape().RollupConfig().TimestampForBlock(5)
Expand All @@ -22,7 +22,7 @@ func TestFPP(gt *testing.T) {

func TestNextSuperRootNotFound(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
blockTime := sys.L2ChainA.Escape().RollupConfig().BlockTime

// Need to setup situation where the next super root is not found but the next block is safe on the first chain, but not safe on the second.
Expand Down
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/interop/proofs/proposer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

func TestProposer(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)

dgf := sys.DisputeGameFactory()

Expand Down
26 changes: 13 additions & 13 deletions op-acceptance-tests/tests/interop/proofs/serial/interop_fault_proofs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,41 +12,41 @@ import (

func TestInteropFaultProofs(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunSuperFaultProofTest(t, sys)
}

func TestInteropFaultProofs_PreForkActivation(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithSuggestedInteropActivationOffset(365*24*60*60))
sys := presets.NewSimpleInterop(t, presets.WithSuggestedInteropActivationOffset(365*24*60*60))
sfp.RunPreForkActivationTest(t, sys)
}

func TestInteropFaultProofs_ActivationBoundary(gt *testing.T) {
t := devtest.SerialT(gt)
// Set interop activation ~6s (3 blocks) after genesis. A small offset keeps
// the fork reachable within CI timeouts while still having pre-interop blocks.
sys := presets.NewSimpleInteropSupernodeProofs(t,
sys := presets.NewSimpleInterop(t,
presets.WithSuggestedInteropActivationOffset(6),
)
sfp.RunInteropActivationBoundaryTest(t, sys)
}

func TestInteropFaultProofs_ConsolidateValidCrossChainMessage(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunConsolidateValidCrossChainMessageTest(t, sys)
}

func TestInteropFaultProofs_DepositMessage(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunDepositMessageTest(t, sys)
}

func TestInteropFaultProofs_VariedBlockTimes(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(
sys := presets.NewSimpleInterop(
t,
presets.WithL2BlockTimes(map[eth.ChainID]uint64{
sysgo.DefaultL2AID: 1,
Expand All @@ -58,7 +58,7 @@ func TestInteropFaultProofs_VariedBlockTimes(gt *testing.T) {

func TestInteropFaultProofs_VariedBlockTimes_FasterChainB(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(
sys := presets.NewSimpleInterop(
t,
presets.WithL2BlockTimes(map[eth.ChainID]uint64{
sysgo.DefaultL2AID: 2,
Expand All @@ -70,42 +70,42 @@ func TestInteropFaultProofs_VariedBlockTimes_FasterChainB(gt *testing.T) {

func TestInteropFaultProofs_InvalidBlock(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunInvalidBlockTest(t, sys)
}

func TestInteropFaultProofs_IntraBlock(gt *testing.T) {
for _, tc := range sfp.IntraBlockCases() {
gt.Run(tc.Name, func(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunIntraBlockConsolidationTest(t, sys, tc)
})
}
}

func TestInteropFaultProofs_DepositMessage_InvalidExecution(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunDepositMessageInvalidExecutionTest(t, sys)
}

func TestInteropFaultProofs_SuperrootOptimisticPairing(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunOptimisticPairingTest(t, sys, true)
}

func TestInteropFaultProofs_SuperrootOptimisticPairing_NoReplacement(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t)
sys := presets.NewSimpleInterop(t)
sfp.RunOptimisticPairingTest(t, sys, false)
}

func TestInteropFaultProofs_MessageExpiry(gt *testing.T) {
t := devtest.SerialT(gt)
const messageExpiryWindow = uint64(12) // 12 seconds for fast test
sys := presets.NewSimpleInteropSupernodeProofs(t,
sys := presets.NewSimpleInterop(t,
presets.WithMessageExpiryWindow(messageExpiryWindow),
)
sfp.RunMessageExpiryTest(t, sys, messageExpiryWindow)
Expand Down
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/interop/proofs/withdrawal/withdrawal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func TestSuperRootWithdrawal(gt *testing.T) {
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInteropSupernodeProofs(t, presets.WithTimeTravelEnabled())
sys := presets.NewSimpleInterop(t, presets.WithTimeTravelEnabled())
sys.L1Network.WaitForOnline()

initialL1Balance := eth.HalfEther
Expand Down
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/interop/super-via-upgrade/super_dispute_game_via_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
// the permissionless super games and makes SUPER_CANNON_KONA the respected type.
func TestSuperRootGamesInstalledViaOPCMUpgrade(gt *testing.T) {
t := devtest.SerialT(gt)
sys := presets.NewSingleChainInteropSupernodeProofs(t)
sys := presets.NewSingleChainInterop(t)

sys.StandardBridge(sys.L2ChainA).VerifyRespectedGameType(gameTypes.SuperCannonKonaGameType)
sys.DisputeGameFactory().VerifyGameImplPresent(gameTypes.SuperCannonKonaGameType)
Expand Down
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/interop/upgrade-singlechain/crossl2inbox_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
func TestPostInbox(gt *testing.T) {
t := devtest.ParallelT(gt)
offset := uint64(30)
sys := presets.NewSingleChainInteropSupernodeProofs(t, presets.WithDeployerOptions(
sys := presets.NewSingleChainInterop(t, presets.WithDeployerOptions(
func(p devtest.T, keys devkeys.Keys, builder intentbuilder.Builder) {
for _, l2Cfg := range builder.L2s() {
l2Cfg.WithForkAtOffset(forks.Interop, &offset)
Expand Down
1 change: 0 additions & 1 deletion op-devstack/dsl/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ type ChainBlockProvider interface {
}

var _ SyncStatusProvider = (*L2CLNode)(nil)
var _ SyncStatusProvider = (*Supervisor)(nil)

// LaggedFn returns a lambda that checks the baseNode head with given safety level is lagged with the refNode chain sync status provider
// Composable with other lambdas to wait in parallel
Expand Down
164 changes: 0 additions & 164 deletions op-devstack/dsl/supervisor.go
View file
Open in desktop

This file was deleted.

Loading
Loading