Merge branch 'master' into bold_staker_balance_metrics

Author: amsanghi

.github/workflows/ci.yml

@@ -153,13 +153,13 @@ jobs:
         if: matrix.test-mode == 'pathdb'
         run: |
           echo "Running tests with Path Scheme" >> full.log
-          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 20m --cover --test_state_scheme path
+          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 90m --cover --test_state_scheme path
 
       - name: run tests without race detection and hash state scheme
         if: matrix.test-mode == 'defaults'
         run: |
           echo "Running tests with Hash Scheme" >> full.log
-          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 20m --test_state_scheme hash
+          ${{ github.workspace }}/.github/workflows/gotestsum.sh --tags cionly --timeout 60m --test_state_scheme hash
 
       - name: run redis tests
         if: matrix.test-mode == 'defaults'

system_tests/aliasing_test.go

@@ -19,7 +19,6 @@ import (
 )
 
 func TestAliasing(t *testing.T) {
-	t.Parallel()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 

system_tests/arbos_upgrade_test.go

@@ -95,8 +95,6 @@ func checkArbOSVersion(t *testing.T, testClient *TestClient, expectedVersion uin
 }
 
 func TestArbos11To32UpgradeWithMcopy(t *testing.T) {
-	t.Parallel()
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -199,8 +197,6 @@ func TestArbos11To32UpgradeWithMcopy(t *testing.T) {
 }
 
 func TestArbos11To32UpgradeWithCalldata(t *testing.T) {
-	t.Parallel()
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 

system_tests/batch_poster_test.go

@@ -208,7 +208,6 @@ func testBatchPosterParallel(t *testing.T, useRedis bool) {
 }
 
 func TestBatchPosterLargeTx(t *testing.T) {
-	t.Parallel()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -281,7 +280,6 @@ func TestBatchPosterKeepsUp(t *testing.T) {
 }
 
 func testAllowPostingFirstBatchWhenSequencerMessageCountMismatch(t *testing.T, enabled bool) {
-	t.Parallel()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -486,8 +484,6 @@ func TestBatchPosterDelayBufferDontForceNonDelayedMessages(t *testing.T) {
 }
 
 func TestParentChainNonEIP7623(t *testing.T) {
-	t.Parallel()
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 

system_tests/block_validator_test.go

@@ -53,7 +53,6 @@ type Options struct {
 }
 
 func testBlockValidatorSimple(t *testing.T, opts Options) {
-	t.Parallel()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -71,7 +70,8 @@ func testBlockValidatorSimple(t *testing.T, opts Options) {
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
 	builder = builder.WithWasmRootDir(opts.wasmRootDir)
 	// For now PathDB is not supported when using block validation
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.RequireScheme(t, rawdb.HashScheme)
+
 	builder.nodeConfig = l1NodeConfigA
 	builder.chainConfig = chainConfig
 	builder.L2Info = nil

system_tests/blocks_reexecutor_test.go

@@ -23,7 +23,9 @@ func testBlocksReExecutorModes(t *testing.T, onMultipleRanges bool) {
 	defer cancel()
 
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, false)
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	// For now PathDB is not supported
+	builder.RequireScheme(t, rawdb.HashScheme)
+
 	// This allows us to see reexecution of multiple ranges
 	if onMultipleRanges {
 		builder.execConfig.Caching.Archive = true

system_tests/bold_challenge_protocol_test.go

@@ -603,9 +603,8 @@ func createTestNodeOnL1ForBoldProtocol(
 	l1info.SetContract("Rollup", addresses.Rollup)
 	l1info.SetContract("UpgradeExecutor", addresses.UpgradeExecutor)
 
-	execConfig := ExecConfigDefaultNonSequencerTest(t)
+	execConfig := ExecConfigDefaultNonSequencerTest(t, rawdb.HashScheme)
 	Require(t, execConfig.Validate())
-	execConfig.Caching.StateScheme = rawdb.HashScheme
 	useWasmCache := uint32(1)
 	initMessage := getInitMessage(ctx, t, l1client, addresses)
 	_, l2stack, l2chainDb, l2arbDb, l2blockchain = createNonL1BlockChainWithStackConfig(t, l2info, "", chainConfig, nil, initMessage, nil, execConfig, useWasmCache, true)
@@ -831,9 +830,8 @@ func create2ndNodeWithConfigForBoldProtocol(
 	initReader := statetransfer.NewMemoryInitDataReader(l2InitData)
 	initMessage := getInitMessage(ctx, t, l1client, first.DeployInfo)
 
-	execConfig := ExecConfigDefaultNonSequencerTest(t)
+	execConfig := ExecConfigDefaultNonSequencerTest(t, rawdb.HashScheme)
 	Require(t, execConfig.Validate())
-	execConfig.Caching.StateScheme = rawdb.HashScheme
 	coreCacheConfig := gethexec.DefaultCacheConfigFor(l2stack, &execConfig.Caching)
 	l2blockchain, err := gethexec.WriteOrTestBlockChain(l2chainDb, coreCacheConfig, initReader, chainConfig, nil, nil, initMessage, execConfig.TxLookupLimit, 0)
 	Require(t, err)

system_tests/bold_new_challenge_test.go

@@ -136,7 +136,7 @@ func testChallengeProtocolBOLDVirtualBlocks(t *testing.T, wrongAtFirstVirtual bo
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true).WithBoldDeployment()
 
 	// Block validation requires db hash scheme
-	builder.execConfig.Caching.StateScheme = rawdb.HashScheme
+	builder.RequireScheme(t, rawdb.HashScheme)
 	builder.nodeConfig.BlockValidator.Enable = true
 	builder.valnodeConfig.UseJit = false
 

system_tests/classic_redirect_test.go

@@ -14,8 +14,6 @@ import (
 )
 
 func TestClassicRedirectURLNotLeaked(t *testing.T) {
-	t.Parallel()
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()