Speed up Solana integration tests by avoiding redundant container setup.

Cache MCMS program artifacts once per process, fix PreloadMCMS nested-subtest
deadlocks, use a mock env for set-config VerifyPreconditions, and reuse an
existing chain in fund-mcm-pdas instead of starting a second validator.

Author: ecPablo

legacy/pkg/family/solana/testutils/artifacts.go

@@ -3,34 +3,8 @@ package soltestutils
 import (
 	"os"
 	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/solutils"
 )
 
-var (
-	onceCCIP = &sync.Once{}
-)
-
-type downloadFunc func(t *testing.T) string
-
-// downloadChainlinkCCIPProgramArtifacts downloads CCIP Solana artifacts (includes MCMS programs).
-func downloadChainlinkCCIPProgramArtifacts(t *testing.T) string {
-	t.Helper()
-
-	cachePath := programsCacheDir()
-
-	onceCCIP.Do(func() {
-		err := solutils.DownloadChainlinkCCIPProgramArtifacts(t.Context(), cachePath, "", nil)
-		require.NoError(t, err)
-	})
-
-	return cachePath
-}
-
 // programsCacheDir returns where to store downloaded .so files. Leaf dir is solana_programs
 // (under UserCacheDir/TempDir, so "cache" is implied; avoids read-only pkg/mod paths).
 func programsCacheDir() string {

legacy/pkg/family/solana/testutils/preload.go

@@ -1,9 +1,8 @@
 package soltestutils
 
 import (
-	"io"
-	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -13,71 +12,82 @@ import (
 	"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/solutils"
 )
 
-// LoadMCMSPrograms loads the MCMS program artifacts into the given directory.
-//
-// Returns the path to the temporary test directory and a map of program names to IDs.
-func LoadMCMSPrograms(t *testing.T, dir string) (string, map[string]string) {
-	t.Helper()
+// solTestExclusive serializes top-level Solana integration tests that mutate global
+// gobinding program IDs via SetProgramID. solTestDepth allows nested subtests in
+// the same test to re-enter without deadlocking.
+var (
+	solTestExclusive sync.Mutex
+	solTestCountMu   sync.Mutex
+	solTestDepth     int
+)
 
-	progIDs := loadProgramArtifacts(t,
-		solutils.MCMSProgramNames, downloadChainlinkCCIPProgramArtifacts, dir,
-	)
+func acquireSolanaTestIsolation(t *testing.T) {
+	t.Helper()
 
-	return dir, progIDs
+	solTestCountMu.Lock()
+	if solTestDepth == 0 {
+		solTestExclusive.Lock()
+	}
+	solTestDepth++
+	solTestCountMu.Unlock()
+
+	t.Cleanup(func() {
+		solTestCountMu.Lock()
+		solTestDepth--
+		release := solTestDepth == 0
+		solTestCountMu.Unlock()
+		if release {
+			solTestExclusive.Unlock()
+		}
+	})
 }
 
-// PreloadMCMS provides a convenience function to preload the MCMS program artifacts and address
-// book for a given selector.
-func PreloadMCMS(t *testing.T, selector uint64) (string, map[string]string, *cldf.AddressBookMap) {
-	t.Helper()
+var (
+	mcmsProgramsOnce sync.Once
+	mcmsProgramsPath string
+	mcmsProgramIDs   map[string]string
+)
 
-	dir := t.TempDir()
+// sharedMCMSPrograms downloads MCMS Solana program artifacts once per test process
+// and returns the shared cache directory plus program IDs.
+func sharedMCMSPrograms(t *testing.T) (string, map[string]string) {
+	t.Helper()
 
-	_, programIDs := LoadMCMSPrograms(t, dir)
+	mcmsProgramsOnce.Do(func() {
+		mcmsProgramsPath = programsCacheDir()
+		err := solutils.DownloadChainlinkCCIPProgramArtifacts(t.Context(), mcmsProgramsPath, "", nil)
+		require.NoError(t, err)
+
+		mcmsProgramIDs = make(map[string]string, len(solutils.MCMSProgramNames))
+		for _, name := range solutils.MCMSProgramNames {
+			id := solutils.GetProgramID(name)
+			require.NotEmpty(t, id, "program id not found for program name: %s", name)
+			require.FileExists(t, filepath.Join(mcmsProgramsPath, name+".so"))
+			mcmsProgramIDs[name] = id
+		}
+	})
+
+	return mcmsProgramsPath, copyProgramIDs(mcmsProgramIDs)
+}
 
-	ab := PreloadAddressBookWithMCMSPrograms(t, selector)
+func copyProgramIDs(src map[string]string) map[string]string {
+	dst := make(map[string]string, len(src))
+	for name, id := range src {
+		dst[name] = id
+	}
 
-	return dir, programIDs, ab
+	return dst
 }
 
-// loadProgramArtifacts is a helper function that loads program artifacts into a temporary test directory.
-// It downloads artifacts using the provided download function and copies the specified programs.
-//
-// Returns the map of program names to IDs.
-func loadProgramArtifacts(t *testing.T, programNames []string, downloadFn downloadFunc, targetDir string) map[string]string {
+// PreloadMCMS provides a convenience function to preload the MCMS program artifacts and address
+// book for a given selector.
+func PreloadMCMS(t *testing.T, selector uint64) (string, map[string]string, *cldf.AddressBookMap) {
 	t.Helper()
 
-	// Download the program artifacts using the provided download function
-	cachePath := downloadFn(t)
-
-	progIDs := make(map[string]string, len(programNames))
-
-	// Copy the specific artifacts to the target directory and add the program ID to the map
-	for _, name := range programNames {
-		id := solutils.GetProgramID(name)
-		require.NotEmpty(t, id, "program id not found for program name: %s", name)
+	acquireSolanaTestIsolation(t)
 
-		src := filepath.Join(cachePath, name+".so")
-		dst := filepath.Join(targetDir, name+".so")
-
-		func() {
-			srcFile, err := os.Open(src)
-			require.NoError(t, err)
-			defer srcFile.Close()
-
-			dstFile, err := os.Create(dst)
-			require.NoError(t, err)
-			defer dstFile.Close()
-
-			_, err = io.Copy(dstFile, srcFile)
-			require.NoError(t, err)
-		}()
-
-		// Add the program ID to the map
-		progIDs[name] = id
-		t.Logf("copied solana program %s to %s", name, dst)
-	}
+	programsPath, programIDs := sharedMCMSPrograms(t)
+	ab := PreloadAddressBookWithMCMSPrograms(t, selector)
 
-	// Return the path to the cached artifacts and the map of program IDs
-	return progIDs
+	return programsPath, programIDs, ab
 }

mcms/changesets/set-config/changeset_test.go

@@ -176,11 +176,11 @@ func TestChangeset_VerifyPreconditions(t *testing.T) {
 	}
 }
 
-//nolint:paralleltest // global mcm.SetProgramID state and shared Solana CTF container setup
 func TestChangeset_VerifyPreconditions_Solana(t *testing.T) {
+	t.Parallel()
+
 	selector := chain_selectors.TEST_22222222222222222222222222222222222222222222.Selector
-	rt := newSolanaRuntimeWithDeploy(t, selector)
-	env := rt.Environment()
+	env := newSolanaVerifyPreconditionsEnv(t, selector)
 
 	validCfg := cldftesthelpers.SingleGroupMCMS(t)
 	validTargets := mcmsTargets(selector, validCfg, validCfg, validCfg)

mcms/changesets/set-config/helpers_test.go

@@ -1,15 +1,20 @@
 package setconfig_test
 
 import (
+	"context"
 	"crypto/ecdsa"
 	"testing"
 	"time"
 
+	"github.com/Masterminds/semver/v3"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 
+	cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
+	cldfsol "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"
 	cldfdatastore "github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	mcmscontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/mcms"
 	cldfproposalutils "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/mcms/proposalutils"
@@ -146,6 +151,42 @@ func evmMCMSChainState(t *testing.T, rt *runtime.Runtime, selector uint64) (*evm
 	return mcmsState, chain
 }
 
+// newSolanaVerifyPreconditionsEnv builds a mock Solana environment for VerifyPreconditions
+// only — no CTF container or on-chain deploy.
+func newSolanaVerifyPreconditionsEnv(t *testing.T, selector uint64) cldf.Environment {
+	t.Helper()
+
+	ds := datastore.NewMemoryDataStore()
+	version := semver.MustParse("1.0.0")
+	for _, ref := range []struct {
+		contractType cldf.ContractType
+		address      string
+	}{
+		{mcmscontracts.RBACTimelock, "timelock-address"},
+		{mcmscontracts.ProposerManyChainMultisig, "proposer-address"},
+		{mcmscontracts.CancellerManyChainMultisig, "canceller-address"},
+		{mcmscontracts.BypasserManyChainMultisig, "bypasser-address"},
+	} {
+		require.NoError(t, ds.Addresses().Add(datastore.AddressRef{
+			Address:       ref.address,
+			ChainSelector: selector,
+			Type:          datastore.ContractType(ref.contractType),
+			Version:       version,
+		}))
+	}
+
+	return cldf.Environment{
+		Logger:    logger.Test(t),
+		DataStore: ds.Seal(),
+		GetContext: func() context.Context {
+			return t.Context()
+		},
+		BlockChains: cldf_chain.NewBlockChains(map[uint64]cldf_chain.BlockChain{
+			selector: cldfsol.Chain{Selector: selector},
+		}),
+	}
+}
+
 func newSolanaRuntimeWithDeploy(t *testing.T, selector uint64) *runtime.Runtime {
 	t.Helper()
 

mcms/solana/changesets/fund-mcm-pdas/changeset_test.go

@@ -138,8 +138,11 @@ func TestChangeset(t *testing.T) {
 		}
 
 		t.Run("mcms contracts not deployed", func(t *testing.T) {
-			rt2 := testRuntime(t, selector2)
-			env := configureFundMCMSignersEnv(t, rt2.Environment(), selector2, rpcWithBalance(t, 1_000), false)
+			chain := rt1.Environment().BlockChains.SolanaChains()[selector1]
+			chain.Client = rpcWithBalance(t, 1_000)
+			env := cldf.Environment{DataStore: newMCMSDataStore(t, selector2, false)}
+			env.BlockChains = cldf_chain.NewBlockChains(map[uint64]cldf_chain.BlockChain{selector2: chain})
+
 			err := cs.VerifyPreconditions(env, Config{
 				FundingPerChain: map[uint64]FundingConfig{selector2: {
 					ProposeMCM:   100,