refactor: chain setup

Makefile

@@ -161,6 +161,7 @@ test-coverage:
 	@export VERSION=$(VERSION); bash -x scripts/test_cover.sh
 .PHONY: test-coverage
 
+## test-fuzz: Run all fuzz tests.
 test-fuzz:
 	bash -x scripts/test_fuzz.sh
 .PHONY: test-fuzz

interchaintest/chains.go

@@ -1,12 +1,15 @@
 package interchaintest_test
 
 import (
+	"testing"
+
 	"github.com/strangelove-ventures/interchaintest/v6"
 	"github.com/strangelove-ventures/interchaintest/v6/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v6/ibc"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zaptest"
 )
 
-var chainSpecs = []*interchaintest.ChainSpec{celestiaSpec, cosmosSpec}
 var celestiaSpec = &interchaintest.ChainSpec{
 	Name: "celestia",
 	ChainConfig: ibc.ChainConfig{
@@ -28,3 +31,12 @@ var cosmosSpec = &interchaintest.ChainSpec{
 	ChainConfig: cosmos.NewCosmosHeighlinerChainConfig("gaia", "gaiad", "cosmos", "uatom", "0.01uatom", 1.3, "504h", false),
 	Version:     "v14.1.0",
 }
+
+// getChains returns two chains for testing: celestia and gaia.
+func getChains(t *testing.T) (celestia *cosmos.CosmosChain, gaia *cosmos.CosmosChain) {
+	chainSpecs := []*interchaintest.ChainSpec{celestiaSpec, cosmosSpec}
+	chainFactory := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), chainSpecs)
+	chains, err := chainFactory.Chains(t.Name())
+	require.NoError(t, err)
+	return chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain)
+}

interchaintest/ica_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/strangelove-ventures/interchaintest/v6"
-	"github.com/strangelove-ventures/interchaintest/v6/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v6/ibc"
 	"github.com/strangelove-ventures/interchaintest/v6/relayer"
 	"github.com/strangelove-ventures/interchaintest/v6/testreporter"
@@ -22,35 +21,34 @@ func TestICA(t *testing.T) {
 		t.Skip("skipping TestICA in short mode.")
 	}
 
-	ctx := context.Background()
 	client, network := interchaintest.DockerSetup(t)
-	rep := testreporter.NewNopReporter()
-	eRep := rep.RelayerExecReporter(t)
-	chainFactory := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), chainSpecs)
-	chains, err := chainFactory.Chains(t.Name())
-	require.NoError(t, err)
-	chain1, chain2 := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain)
+	celestia, gaia := getChains(t)
 
 	relayer := interchaintest.NewBuiltinRelayerFactory(
 		ibc.CosmosRly,
 		zaptest.NewLogger(t),
 		relayer.RelayerOptionExtraStartFlags{Flags: []string{"-p", "events", "-b", "100"}},
 	).Build(t, client, network)
+
 	ic := interchaintest.NewInterchain().
-		AddChain(chain1).
-		AddChain(chain2).
+		AddChain(celestia).
+		AddChain(gaia).
 		AddRelayer(relayer, relayerName).
 		AddLink(interchaintest.InterchainLink{
-			Chain1:  chain1,
-			Chain2:  chain2,
+			Chain1:  celestia,
+			Chain2:  gaia,
 			Relayer: relayer,
 			Path:    path,
 		})
-	require.NoError(t, ic.Build(ctx, eRep, interchaintest.InterchainBuildOptions{
+
+	ctx := context.Background()
+	rep := testreporter.NewNopReporter().RelayerExecReporter(t)
+	// Build the interchain
+	err := ic.Build(ctx, rep, interchaintest.InterchainBuildOptions{
 		TestName:         t.Name(),
 		Client:           client,
 		NetworkID:        network,
 		SkipPathCreation: true,
-	}))
-
+	})
+	require.NoError(t, err)
 }