diff --git a/docs/ai/acceptance-tests.md b/docs/ai/acceptance-tests.md index fa9688f131c..135c135f0d0 100644 --- a/docs/ai/acceptance-tests.md +++ b/docs/ai/acceptance-tests.md @@ -53,7 +53,9 @@ CI runs two variants of the `op-acceptance-tests` job: `memory-all-opn-op-reth-< (op-node + op-reth) and `memory-all-kona-op-reth-` (kona-node + op-reth). A test that cannot run under a given client skips itself in code rather than being left out of -a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. +a list — `sysgo.SkipOnKonaNode`, `sysgo.SkipOnOpReth` and `sysgo.SkipOnOpGeth`. Skip only for +a real client gap. A test that pins the CL kind of every node itself runs the same way in both +CL variants; let it run twice rather than skipping one variant to save CI time. ### Kona Prestate diff --git a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go index 0e1b6f34206..93a83edb202 100644 --- a/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go +++ b/op-acceptance-tests/tests/derivation/confirmations/confirmations_test.go @@ -28,7 +28,6 @@ type capturedTest struct { func (t capturedTest) Logger() log.Logger { return t.logger } func TestVerifierConfirmationsProtectDerivationFromShallowL1Reorg(gt *testing.T) { - sysgo.SkipOnKonaNode(devtest.SerialT(gt), "pins op-node and kona-node explicitly; covered by the op-node variant") for _, confirmations := range []uint64{0, 4} { gt.Run(fmt.Sprintf("confirmations_%d", confirmations), func(gt *testing.T) { testShallowL1Reorg(gt, confirmations) diff --git a/op-acceptance-tests/tests/proofs/zk/non_interop_test.go b/op-acceptance-tests/tests/proofs/zk/non_interop_test.go index 3bcbcf23e51..0619230288c 100644 --- a/op-acceptance-tests/tests/proofs/zk/non_interop_test.go +++ b/op-acceptance-tests/tests/proofs/zk/non_interop_test.go @@ -16,7 +16,6 @@ import ( ) func newNonInteropZKSystem(t devtest.T) (*presets.Minimal, *proofs.DisputeGameFactory) { - sysgo.SkipOnKonaNode(t, "requires op-node's single-chain superroot_atTimestamp RPC") sys := presets.NewMinimal(t, presets.WithDeployerOptions( sysgo.WithJovianAtGenesis, @@ -29,7 +28,7 @@ func newNonInteropZKSystem(t devtest.T) (*presets.Minimal, *proofs.DisputeGameFa t.Require().Len(sys.L2Networks(), 1) t.Require().Nil(sys.L2Chain.Escape().RollupConfig().LagoonTime, "interop must remain disabled") - // Minimal runs no supernode; the proposer and challenger source super roots from op-node. + // Minimal runs no supernode; the proposer and challenger source super roots from the rollup node. factory := proofs.NewDisputeGameFactory(t, sys.L1Network, sys.L1EL.EthClient(), sys.L2Chain.DisputeGameFactoryProxyAddr(), sys.L2CL, sys.L2EL, dsl.NewOpNodeSuperRoots(sys.L2CL), nil, nil) return sys, factory diff --git a/op-acceptance-tests/tests/safedb_parity/init_test.go b/op-acceptance-tests/tests/safedb_parity/init_test.go index 8482e5eec12..8abba6b772c 100644 --- a/op-acceptance-tests/tests/safedb_parity/init_test.go +++ b/op-acceptance-tests/tests/safedb_parity/init_test.go @@ -38,8 +38,6 @@ func newParitySystemWithSafeDB(t devtest.T, enabled bool) *paritySystem { } func newParitySystemWithExecutionClient(t devtest.T, enabled bool, executionClient sysgo.MixedL2ELKind) *paritySystem { - // Every node's CL kind is pinned, so the kona-node CI variant would only repeat this run. - sysgo.SkipOnKonaNode(t, "pins op-node and kona-node explicitly; covered by the op-node variant") var deployerOptions []sysgo.DeployerOption if executionClient == sysgo.MixedL2ELOpGeth { // op-geth cannot build or import Karst blocks, so its chain stays on Jovian. diff --git a/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go b/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go index 9aa4a2114d2..c7929eee690 100644 --- a/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go +++ b/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go @@ -74,16 +74,6 @@ func TestTruncateDatabaseOnELResync(gt *testing.T) { func TestNotTruncateDatabaseOnRestartWithExistingDatabase(gt *testing.T) { t := devtest.ParallelT(gt) - // Example error with kona-node: - // - // assertions.go:387: ERROR[03-31|10:35:59.154] - // assertions.go:387: Error Trace: /Users/josh/repos/optimism/op-devstack/dsl/safedb.go:22 - // assertions.go:387: /Users/josh/repos/optimism/op-devstack/dsl/l2_cl.go:432 - // assertions.go:387: /Users/josh/repos/optimism/op-acceptance-tests/tests/safeheaddb_elsync/safeheaddb_test.go:74 - // assertions.go:387: Error: Expected value not to be nil. - // assertions.go:387: Test: TestNotTruncateDatabaseOnRestartWithExistingDatabase - // assertions.go:387: Messages: no safe head data available at L1 block 4 - sysgo.SkipOnKonaNode(t, "not supported") sys := newSingleChainMultiNodeELSync(t) dsl.CheckAll(t, diff --git a/op-devstack/dsl/super_root_source.go b/op-devstack/dsl/super_root_source.go index da2c79ca37e..a00936848a0 100644 --- a/op-devstack/dsl/super_root_source.go +++ b/op-devstack/dsl/super_root_source.go @@ -46,9 +46,8 @@ type SuperRootQuerier struct { userRPC string } -// NewOpNodeSuperRoots wraps a single op-node's superroot_atTimestamp endpoint as a -// super-root source. Only superroot_atTimestamp is served by op-node; SyncStatus -// (supernode_syncStatus) is not available on this source. +// NewOpNodeSuperRoots wraps a single rollup node's (op-node or kona-node) +// superroot_atTimestamp endpoint as a super-root source. func NewOpNodeSuperRoots(cl *L2CLNode) *SuperRootQuerier { return &SuperRootQuerier{ commonImpl: commonFromT(cl.t), diff --git a/op-devstack/sysgo/singlechain_runtime.go b/op-devstack/sysgo/singlechain_runtime.go index 7d443958482..3c02e207e07 100644 --- a/op-devstack/sysgo/singlechain_runtime.go +++ b/op-devstack/sysgo/singlechain_runtime.go @@ -464,7 +464,7 @@ func startMinimalChallenger( var zkChallengerSuperRootRPCProxy *StallableProxy switch { case zkEnabled: - // The ZK game validates super roots from the op-node's superroot_atTimestamp endpoint; + // The ZK game validates super roots from the rollup node's superroot_atTimestamp endpoint; // it needs no VM config or dependency set. zkChallengerSuperRootRPCProxy = StartStallableProxy(t, "zk-challenger-super-root", l2CL.UserRPC()) options = append(options,