chore: refactor test setup to allow for injection of docker client

Author: chatton

execution/evm/test/execution_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	tastoradocker "github.com/celestiaorg/tastora/framework/docker"
 	"github.com/ethereum/go-ethereum/common"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -59,8 +60,10 @@ func TestEngineExecution(t *testing.T) {
 	genesisStateRoot := common.HexToHash(GENESIS_STATEROOT)
 	GenesisStateRoot := genesisStateRoot[:]
 
+	dockerClient, dockerNetworkID := tastoradocker.Setup(t)
+
 	t.Run("Build chain", func(tt *testing.T) {
-		rethNode := SetupTestRethNode(t)
+		rethNode := SetupTestRethNode(t, dockerClient, dockerNetworkID)
 
 		ni, err := rethNode.GetNetworkInfo(context.TODO())
 		require.NoError(tt, err)
@@ -158,7 +161,7 @@ func TestEngineExecution(t *testing.T) {
 
 	// start new container and try to sync
 	t.Run("Sync chain", func(tt *testing.T) {
-		rethNode := SetupTestRethNode(t)
+		rethNode := SetupTestRethNode(t, dockerClient, dockerNetworkID)
 
 		ni, err := rethNode.GetNetworkInfo(context.TODO())
 		require.NoError(tt, err)

execution/evm/test/test_helpers.go

@@ -9,11 +9,9 @@ import (
 	mathrand "math/rand"
 	"net/http"
 	"strings"
-	"sync"
 	"testing"
 	"time"
 
-	"github.com/celestiaorg/tastora/framework/docker"
 	"github.com/celestiaorg/tastora/framework/docker/evstack/reth"
 	"github.com/celestiaorg/tastora/framework/types"
 	"github.com/golang-jwt/jwt/v5"
@@ -22,12 +20,10 @@ import (
 	"go.uber.org/zap/zaptest"
 )
 
-// Test-scoped Docker client/network mapping to avoid conflicts between tests
-var (
-	dockerClients  = make(map[string]types.TastoraDockerClient)
-	dockerNetworks = make(map[string]string)
-	dockerMutex    sync.RWMutex
-)
+// (Docker client/network are now provided by callers)
+
+// RethNodeOpt allows tests to customize the reth node builder before building.
+type RethNodeOpt func(b *reth.NodeBuilder)
 
 const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
@@ -40,47 +36,32 @@ func randomString(n int) string {
 	return string(b)
 }
 
-// getTestScopedDockerSetup returns a Docker client and network ID that are scoped to the specific test.
-func getTestScopedDockerSetup(t testing.TB) (types.TastoraDockerClient, string) {
-	t.Helper()
-
-	testKey := t.Name()
-	dockerMutex.Lock()
-	defer dockerMutex.Unlock()
-
-	dockerCli, exists := dockerClients[testKey]
-	if !exists {
-		cli, netID := docker.Setup(t)
-		dockerClients[testKey] = cli
-		dockerNetworks[testKey] = netID
-		dockerCli = cli
-	}
-	dockerNetID := dockerNetworks[testKey]
-
-	return dockerCli, dockerNetID
-}
-
 // SetupTestRethNode creates a single Reth node for testing purposes.
-func SetupTestRethNode(t testing.TB) *reth.Node {
+func SetupTestRethNode(t testing.TB, client types.TastoraDockerClient, networkID string, opts ...RethNodeOpt) *reth.Node {
 	t.Helper()
 	ctx := context.Background()
 
-	dockerCli, dockerNetID := getTestScopedDockerSetup(t)
-
 	testName := fmt.Sprintf("%s-%s", t.Name(), randomString(6))
 	logger := zap.NewNop()
 	if testing.Verbose() {
 		logger = zaptest.NewLogger(t)
 	}
-	n, err := new(reth.NodeBuilder).
+	b := new(reth.NodeBuilder).
 		WithTestName(testName).
 		WithLogger(logger).
 		WithImage(reth.DefaultImage()).
 		WithBin("ev-reth").
-		WithDockerClient(dockerCli).
-		WithDockerNetworkID(dockerNetID).
-		WithGenesis([]byte(reth.DefaultEvolveGenesisJSON())).
-		Build(ctx)
+		WithDockerClient(client).
+		WithDockerNetworkID(networkID).
+		WithGenesis([]byte(reth.DefaultEvolveGenesisJSON()))
+
+	for _, opt := range opts {
+		if opt != nil {
+			opt(b)
+		}
+	}
+
+	n, err := b.Build(ctx)
 	t.Cleanup(func() {
 		_ = n.Remove(context.Background())
 	})

test/e2e/evm_contract_e2e_test.go

@@ -3,15 +3,16 @@
 package e2e
 
 import (
-	"context"
-	"crypto/ecdsa"
-	"math/big"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
+    "context"
+    "crypto/ecdsa"
+    "math/big"
+    "path/filepath"
+    "testing"
+    "time"
+
+    tastoradocker "github.com/celestiaorg/tastora/framework/docker"
+    "github.com/ethereum/go-ethereum"
+    "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -49,7 +50,7 @@ func TestEvmContractDeploymentAndInteraction(t *testing.T) {
 	workDir := t.TempDir()
 	sequencerHome := filepath.Join(workDir, "evm-sequencer")
 
-	client, _, cleanup := setupTestSequencer(t, sequencerHome)
+    client, _, cleanup := setupTestSequencer(t, sequencerHome)
 	defer cleanup()
 
 	ctx := t.Context()
@@ -241,9 +242,10 @@ func TestEvmContractEvents(t *testing.T) {
 // setupTestSequencer sets up a single sequencer node for testing.
 // Returns the ethclient, genesis hash, and a cleanup function.
 func setupTestSequencer(t testing.TB, homeDir string, extraArgs ...string) (*ethclient.Client, string, func()) {
-	sut := NewSystemUnderTest(t)
+    sut := NewSystemUnderTest(t)
 
-	genesisHash, seqEthURL := setupSequencerOnlyTest(t, sut, homeDir, extraArgs...)
+    dcli, netID := tastoradocker.Setup(t)
+    genesisHash, seqEthURL := setupSequencerOnlyTest(t, sut, homeDir, dcli, netID, extraArgs...)
 	t.Logf("Sequencer started at %s (Genesis: %s)", seqEthURL, genesisHash)
 
 	client, err := ethclient.Dial(seqEthURL)

test/e2e/evm_da_restart_e2e_test.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 	"time"
 
+	tastoradocker "github.com/celestiaorg/tastora/framework/docker"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
@@ -56,7 +57,8 @@ func TestEvmDARestartWithPendingBlocksE2E(t *testing.T) {
 	sut := NewSystemUnderTest(t)
 
 	// Setup sequencer and get genesis hash
-	genesisHash, seqURL := setupSequencerOnlyTest(t, sut, nodeHome)
+	dcli, netID := tastoradocker.Setup(t)
+	genesisHash, seqURL := setupSequencerOnlyTest(t, sut, nodeHome, dcli, netID)
 	t.Logf("Genesis hash: %s", genesisHash)
 
 	// Connect to EVM

test/e2e/evm_force_inclusion_e2e_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	tastoradocker "github.com/celestiaorg/tastora/framework/docker"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/rs/zerolog"
@@ -77,13 +78,15 @@ func setupSequencerWithForceInclusion(t *testing.T, sut *SystemUnderTest, nodeHo
 	t.Helper()
 
 	// Use common setup (no full node needed initially)
-	jwtSecret, _, genesisHash, endpoints, _ := setupCommonEVMTest(t, sut, false)
+	dcli, netID := tastoradocker.Setup(t)
+    env := setupCommonEVMEnv(t, sut, dcli, netID)
+	// Use env fields inline below to reduce local vars
 
 	// Create passphrase file
 	passphraseFile := createPassphraseFile(t, nodeHome)
 
 	// Create JWT secret file
-	jwtSecretFile := createJWTSecretFile(t, nodeHome, jwtSecret)
+	jwtSecretFile := createJWTSecretFile(t, nodeHome, env.SequencerJWT)
 
 	// Initialize sequencer node
 	output, err := sut.RunCmd(evmSingleBinaryPath,
@@ -102,25 +105,25 @@ func setupSequencerWithForceInclusion(t *testing.T, sut *SystemUnderTest, nodeHo
 	args := []string{
 		"start",
 		"--evm.jwt-secret-file", jwtSecretFile,
-		"--evm.genesis-hash", genesisHash,
+		"--evm.genesis-hash", env.GenesisHash,
 		"--evnode.node.block_time", DefaultBlockTime,
 		"--evnode.node.aggregator=true",
 		"--evnode.signer.passphrase_file", passphraseFile,
 		"--home", nodeHome,
 		"--evnode.da.block_time", DefaultDABlockTime,
-		"--evnode.da.address", endpoints.GetDAAddress(),
+		"--evnode.da.address", env.Endpoints.GetDAAddress(),
 		"--evnode.da.namespace", DefaultDANamespace,
 		"--evnode.da.forced_inclusion_namespace", "forced-inc",
-		"--evnode.rpc.address", endpoints.GetRollkitRPCListen(),
-		"--evnode.p2p.listen_address", endpoints.GetRollkitP2PAddress(),
-		"--evm.engine-url", endpoints.GetSequencerEngineURL(),
-		"--evm.eth-url", endpoints.GetSequencerEthURL(),
+		"--evnode.rpc.address", env.Endpoints.GetRollkitRPCListen(),
+		"--evnode.p2p.listen_address", env.Endpoints.GetRollkitP2PAddress(),
+		"--evm.engine-url", env.Endpoints.GetSequencerEngineURL(),
+		"--evm.eth-url", env.Endpoints.GetSequencerEthURL(),
 		"--force-inclusion-server", fiAddr,
 	}
 	sut.ExecCmd(evmSingleBinaryPath, args...)
-	sut.AwaitNodeUp(t, endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
+	sut.AwaitNodeUp(t, env.Endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
 
-	return genesisHash, endpoints.GetSequencerEthURL()
+	return env.GenesisHash, env.Endpoints.GetSequencerEthURL()
 }
 
 func TestEvmSequencerForceInclusionE2E(t *testing.T) {
@@ -192,10 +195,11 @@ func TestEvmFullNodeForceInclusionE2E(t *testing.T) {
 	// --- Start Sequencer Setup ---
 	// We manually setup sequencer here because we need the force inclusion flag,
 	// and we need to capture variables for full node setup.
-	jwtSecret, fullNodeJwtSecret, genesisHash, endpoints, _ := setupCommonEVMTest(t, sut, true)
+    dcli2, netID2 := tastoradocker.Setup(t)
+    env := setupCommonEVMEnv(t, sut, dcli2, netID2, WithFullNode())
 
 	passphraseFile := createPassphraseFile(t, sequencerHome)
-	jwtSecretFile := createJWTSecretFile(t, sequencerHome, jwtSecret)
+	jwtSecretFile := createJWTSecretFile(t, sequencerHome, env.SequencerJWT)
 
 	output, err := sut.RunCmd(evmSingleBinaryPath,
 		"init",
@@ -212,38 +216,38 @@ func TestEvmFullNodeForceInclusionE2E(t *testing.T) {
 	seqArgs := []string{
 		"start",
 		"--evm.jwt-secret-file", jwtSecretFile,
-		"--evm.genesis-hash", genesisHash,
+		"--evm.genesis-hash", env.GenesisHash,
 		"--evnode.node.block_time", DefaultBlockTime,
 		"--evnode.node.aggregator=true",
 		"--evnode.signer.passphrase_file", passphraseFile,
 		"--home", sequencerHome,
 		"--evnode.da.block_time", DefaultDABlockTime,
-		"--evnode.da.address", endpoints.GetDAAddress(),
+		"--evnode.da.address", env.Endpoints.GetDAAddress(),
 		"--evnode.da.namespace", DefaultDANamespace,
 		"--evnode.da.forced_inclusion_namespace", "forced-inc",
-		"--evnode.rpc.address", endpoints.GetRollkitRPCListen(),
-		"--evnode.p2p.listen_address", endpoints.GetRollkitP2PAddress(),
-		"--evm.engine-url", endpoints.GetSequencerEngineURL(),
-		"--evm.eth-url", endpoints.GetSequencerEthURL(),
+		"--evnode.rpc.address", env.Endpoints.GetRollkitRPCListen(),
+		"--evnode.p2p.listen_address", env.Endpoints.GetRollkitP2PAddress(),
+		"--evm.engine-url", env.Endpoints.GetSequencerEngineURL(),
+		"--evm.eth-url", env.Endpoints.GetSequencerEthURL(),
 		"--force-inclusion-server", fiAddr,
 	}
 	sut.ExecCmd(evmSingleBinaryPath, seqArgs...)
-	sut.AwaitNodeUp(t, endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
+	sut.AwaitNodeUp(t, env.Endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
 	t.Log("Sequencer is up with force inclusion enabled")
 	// --- End Sequencer Setup ---
 
 	// --- Start Full Node Setup ---
 	// Reuse setupFullNode helper which handles genesis copying and node startup
-	setupFullNode(t, sut, fullNodeHome, sequencerHome, fullNodeJwtSecret, genesisHash, endpoints.GetRollkitP2PAddress(), endpoints)
+	setupFullNode(t, sut, fullNodeHome, sequencerHome, env.FullNodeJWT, env.GenesisHash, env.Endpoints.GetRollkitP2PAddress(), env.Endpoints)
 	t.Log("Full node is up")
 	// --- End Full Node Setup ---
 
 	// Connect to clients
-	seqClient, err := ethclient.Dial(endpoints.GetSequencerEthURL())
+	seqClient, err := ethclient.Dial(env.Endpoints.GetSequencerEthURL())
 	require.NoError(t, err)
 	defer seqClient.Close()
 
-	fnClient, err := ethclient.Dial(endpoints.GetFullNodeEthURL())
+	fnClient, err := ethclient.Dial(env.Endpoints.GetFullNodeEthURL())
 	require.NoError(t, err)
 	defer fnClient.Close()
 
@@ -284,10 +288,11 @@ func setupMaliciousSequencer(t *testing.T, sut *SystemUnderTest, nodeHome string
 	t.Helper()
 
 	// Use common setup with full node support
-	jwtSecret, fullNodeJwtSecret, genesisHash, endpoints, _ := setupCommonEVMTest(t, sut, true)
+	env := setupCommonEVMEnv(t, sut, WithFullNode())
+	// Use env fields inline below to reduce local vars
 
 	passphraseFile := createPassphraseFile(t, nodeHome)
-	jwtSecretFile := createJWTSecretFile(t, nodeHome, jwtSecret)
+	jwtSecretFile := createJWTSecretFile(t, nodeHome, env.SequencerJWT)
 
 	output, err := sut.RunCmd(evmSingleBinaryPath,
 		"init",
@@ -303,25 +308,25 @@ func setupMaliciousSequencer(t *testing.T, sut *SystemUnderTest, nodeHome string
 	seqArgs := []string{
 		"start",
 		"--evm.jwt-secret-file", jwtSecretFile,
-		"--evm.genesis-hash", genesisHash,
+		"--evm.genesis-hash", env.GenesisHash,
 		"--evnode.node.block_time", DefaultBlockTime,
 		"--evnode.node.aggregator=true",
 		"--evnode.signer.passphrase_file", passphraseFile,
 		"--home", nodeHome,
 		"--evnode.da.block_time", DefaultDABlockTime,
-		"--evnode.da.address", endpoints.GetDAAddress(),
+		"--evnode.da.address", env.Endpoints.GetDAAddress(),
 		"--evnode.da.namespace", DefaultDANamespace,
 		// CRITICAL: Set sequencer to listen to WRONG namespace - it won't see forced txs
 		"--evnode.da.forced_inclusion_namespace", "wrong-namespace",
-		"--evnode.rpc.address", endpoints.GetRollkitRPCListen(),
-		"--evnode.p2p.listen_address", endpoints.GetRollkitP2PAddress(),
-		"--evm.engine-url", endpoints.GetSequencerEngineURL(),
-		"--evm.eth-url", endpoints.GetSequencerEthURL(),
+		"--evnode.rpc.address", env.Endpoints.GetRollkitRPCListen(),
+		"--evnode.p2p.listen_address", env.Endpoints.GetRollkitP2PAddress(),
+		"--evm.engine-url", env.Endpoints.GetSequencerEngineURL(),
+		"--evm.eth-url", env.Endpoints.GetSequencerEthURL(),
 	}
 	sut.ExecCmd(evmSingleBinaryPath, seqArgs...)
-	sut.AwaitNodeUp(t, endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
+	sut.AwaitNodeUp(t, env.Endpoints.GetRollkitRPCAddress(), NodeStartupTimeout)
 
-	return genesisHash, fullNodeJwtSecret, endpoints
+	return env.GenesisHash, env.FullNodeJWT, env.Endpoints
 }
 
 // setupFullNodeWithForceInclusionCheck sets up a full node that WILL verify forced inclusion txs