system_test: more uses for RequireScheme

Author: tsahee

system_tests/gas_dim_tx_op_precompiles_test.go

@@ -3,7 +3,6 @@ package arbtest
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 
@@ -89,7 +88,6 @@ func gasDimPrecompileBuilderOpts() []func(*NodeBuilder) {
 	builderOpts := func(builder *NodeBuilder) {
 		// Match gasDimensionTestSetup settings
 		builder.execConfig.Caching.Archive = true
-		builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 		builder.execConfig.Sequencer.MaxRevertGasReject = 0
 		builder.WithArbOSVersion(params.MaxArbosVersionSupported)
 	}

system_tests/pruning_test.go

@@ -48,7 +48,6 @@ func testPruning(t *testing.T, mode string, pruneParallelStorageTraversal bool)
 	// PathScheme prunes the state trie by itself, so only HashScheme should be tested
 	builder.RequireScheme(t, rawdb.HashScheme)
 
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 	_ = builder.Build(t)
 	l2cleanupDone := false
 	defer func() {

system_tests/recreatestate_rpc_test.go

@@ -565,8 +565,6 @@ func TestStateAndHeaderForRecentBlock(t *testing.T) {
 	defer cancel()
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
 	builder.execConfig.Caching.Archive = true
-	// For now Archive node should use HashScheme
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 	builder.execConfig.RPC.MaxRecreateStateDepth = 0
 	cleanup := builder.Build(t)
 	defer cleanup()

system_tests/retryable_test.go

@@ -56,7 +56,7 @@ func retryableSetup(t *testing.T, modifyNodeConfig ...func(*NodeBuilder)) (
 
 	// retryableSetup is being called by tests that validate blocks.
 	// For now validation only works with HashScheme set.
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.RequireScheme(t, rawdb.HashScheme)
 	builder.nodeConfig.BlockValidator.Enable = false
 	builder.nodeConfig.Staker.Enable = true
 	builder.nodeConfig.BatchPoster.Enable = true

system_tests/revalidation_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 
@@ -24,7 +23,6 @@ func TestRevalidationForSpecifiedRange(t *testing.T) {
 
 	// 1st node with sequencer, stays up all the time.
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true).DontParalellise()
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 	builder.nodeConfig.BlockValidator.Enable = true
 	builder.L2Info = NewBlockChainTestInfo(
 		t,

system_tests/staker_test.go

@@ -82,7 +82,7 @@ func stakerTestImpl(t *testing.T, faultyStaker bool, honestStakerInactive bool)
 	)
 
 	// For now validation only works with HashScheme set
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.RequireScheme(t, rawdb.HashScheme)
 
 	builder.nodeConfig.BatchPoster.MaxDelay = -1000 * time.Hour
 	cleanupA := builder.Build(t)

system_tests/staterecovery_test.go

@@ -21,8 +21,6 @@ func TestRectreateMissingStates(t *testing.T) {
 	defer cancel()
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
 	builder.execConfig.Caching.Archive = true
-	// For now Archive node should use HashScheme
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 	builder.execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 16
 	builder.execConfig.Caching.SnapshotCache = 0 // disable snapshots
 	_ = builder.Build(t)

system_tests/storage_trie_test.go

@@ -25,7 +25,7 @@ func TestStorageTrie(t *testing.T) {
 
 	// This test tests validates blocks at the end.
 	// For now, validation only works with HashScheme set.
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.RequireScheme(t, rawdb.HashScheme)
 	builder.nodeConfig.BlockValidator.Enable = false
 	builder.nodeConfig.Staker.Enable = true
 	builder.nodeConfig.BatchPoster.Enable = true

system_tests/triedb_race_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/arbitrum"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
 
@@ -25,8 +24,6 @@ func TestTrieDBCommitRace(t *testing.T) {
 	builder.execConfig.Sequencer.MaxBlockSpeed = 0
 	builder.execConfig.Sequencer.MaxTxDataSize = 150 // 1 test tx ~= 110
 	builder.execConfig.Caching.Archive = true
-	// For now Archive node should use HashScheme
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
 	builder.execConfig.Caching.BlockCount = 127
 	builder.execConfig.Caching.BlockAge = 0
 	builder.execConfig.Caching.MaxNumberOfBlocksToSkipStateSaving = 127