Speed up Solana integration tests by avoiding redundant container setup.

Use mock environments for precondition-only tests, fix nested subtest deadlocks
in PreloadMCMS isolation, and reuse an existing chain in fund-mcm-pdas instead
of spinning a second validator.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ecPablo

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

@@ -12,10 +12,35 @@ import (
 	"github.com/smartcontractkit/cld-changesets/legacy/pkg/family/solana/solutils"
 )
 
-// programIDMu serializes Solana integration tests that mutate global gobinding
-// program IDs via SetProgramID. solana-go bindings use process-wide state, so
-// parallel package tests otherwise race and fail with "Program is not deployed".
-var programIDMu sync.Mutex
+// 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
+)
+
+func acquireSolanaTestIsolation(t *testing.T) {
+	t.Helper()
+
+	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()
+		}
+	})
+}
 
 var (
 	mcmsProgramsOnce sync.Once
@@ -59,8 +84,7 @@ func copyProgramIDs(src map[string]string) map[string]string {
 func PreloadMCMS(t *testing.T, selector uint64) (string, map[string]string, *cldf.AddressBookMap) {
 	t.Helper()
 
-	programIDMu.Lock()
-	t.Cleanup(programIDMu.Unlock)
+	acquireSolanaTestIsolation(t)
 
 	programsPath, programIDs := sharedMCMSPrograms(t)
 	ab := PreloadAddressBookWithMCMSPrograms(t, selector)

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,