optimisse test

Author: graham-chainlink

mcms/changesets/set-config/changeset_test.go

@@ -176,35 +176,6 @@ 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) {
-	selector := chain_selectors.TEST_22222222222222222222222222222222222222222222.Selector
-	rt := newSolanaRuntimeWithDeploy(t, selector)
-	env := rt.Environment()
-
-	validCfg := cldftesthelpers.SingleGroupMCMS(t)
-	validTargets := mcmsTargets(selector, validCfg, validCfg, validCfg)
-
-	cs := setconfig.Changeset{}
-	for _, tt := range []struct {
-		name  string
-		input setconfig.Input
-	}{
-		{
-			name:  "valid direct-send input",
-			input: setConfigInput(validTargets, nil),
-		},
-		{
-			name:  "valid MCMS input",
-			input: setConfigInput(validTargets, newMCMSInput(mcmstypes.TimelockActionSchedule, "valid solana proposal", "")),
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			require.NoError(t, cs.VerifyPreconditions(env, tt.input))
-		})
-	}
-}
-
 func TestChangeset_EVM(t *testing.T) {
 	t.Parallel()
 
@@ -484,6 +455,17 @@ func TestChangeset_Solana(t *testing.T) {
 	require.NoError(t, err)
 	soltestutils.FundSignerPDAs(t, chain, mcmsState)
 
+	// Verify preconditions pass on a Solana environment before mutating state.
+	validCfg := cldftesthelpers.SingleGroupMCMS(t)
+	validTargets := mcmsTargets(selector, validCfg, validCfg, validCfg)
+	cs := setconfig.Changeset{}
+	t.Run("verify preconditions - valid direct-send input", func(t *testing.T) { //nolint:paralleltest // shared runtime state
+		require.NoError(t, cs.VerifyPreconditions(rt.Environment(), setConfigInput(validTargets, nil)))
+	})
+	t.Run("verify preconditions - valid MCMS input", func(t *testing.T) { //nolint:paralleltest // shared runtime state
+		require.NoError(t, cs.VerifyPreconditions(rt.Environment(), setConfigInput(validTargets, newMCMSInput(mcmstypes.TimelockActionSchedule, "valid solana proposal", ""))))
+	})
+
 	inspector := solana.NewInspector(chain.Client)
 	signer1Key, signer1Addr := createSolSigner(t)
 	_, signer2Addr := createSolSigner(t)

mcms/solana/deploy/changeset_test.go

@@ -230,52 +230,27 @@ func assertSolanaDeployOnChain(
 }
 
 //nolint:paralleltest // global SetProgramID binding state is shared in-process
-func TestDeployMCMSWithTimelock_Solana_FreshDeploy(t *testing.T) {
+func TestDeployMCMSWithTimelock_Solana(t *testing.T) {
 	selector := chainselectors.TEST_22222222222222222222222222222222222222222222.Selector
 	cfg := cldftesthelpers.SingleGroupTimelockConfig(t)
 
 	rt := newSolanaDeployRuntime(t, selector, datastoreWithMCMSPrograms(t, selector))
 	execSolanaDeployChangeset(t, rt, selector, cfg)
 
-	assertSolanaDeployDatastoreRefs(t, rt, selector)
+	afterFirst := assertSolanaDeployDatastoreRefs(t, rt, selector)
 	assertSolanaDeployOnChain(t, rt, selector, cfg)
-}
-
-//nolint:paralleltest // global SetProgramID binding state is shared in-process
-func TestDeployMCMSWithTimelock_Solana_PartialDeploy(t *testing.T) {
-	selector := chainselectors.TEST_22222222222222222222222222222222222222222222.Selector
-	cfg := cldftesthelpers.SingleGroupTimelockConfig(t)
-
-	rt := newSolanaDeployRuntime(t, selector, datastoreWithMCMSPrograms(t, selector))
-	execSolanaDeployChangeset(t, rt, selector, cfg)
-
-	byType := assertSolanaDeployDatastoreRefs(t, rt, selector)
 
 	// Pre-existing programs must retain their canonical IDs (not be re-deployed).
 	require.Equal(t, solutils.GetProgramID(solutils.ProgAccessController),
-		byType[datastore.ContractType(mcmscontracts.AccessControllerProgram)].Address)
+		afterFirst[datastore.ContractType(mcmscontracts.AccessControllerProgram)].Address)
 	require.Equal(t, solutils.GetProgramID(solutils.ProgMCM),
-		byType[datastore.ContractType(mcmscontracts.ManyChainMultisigProgram)].Address)
+		afterFirst[datastore.ContractType(mcmscontracts.ManyChainMultisigProgram)].Address)
 	require.Equal(t, solutils.GetProgramID(solutils.ProgTimelock),
-		byType[datastore.ContractType(mcmscontracts.RBACTimelockProgram)].Address)
-
-	assertSolanaDeployOnChain(t, rt, selector, cfg)
-}
-
-//nolint:paralleltest // global SetProgramID binding state is shared in-process
-func TestDeployMCMSWithTimelock_Solana_IdempotentReRun(t *testing.T) {
-	selector := chainselectors.TEST_22222222222222222222222222222222222222222222.Selector
-	cfg := cldftesthelpers.SingleGroupTimelockConfig(t)
-
-	rt := newSolanaDeployRuntime(t, selector, datastoreWithMCMSPrograms(t, selector))
-
-	execSolanaDeployChangeset(t, rt, selector, cfg)
-	afterFirst := assertSolanaDeployDatastoreRefs(t, rt, selector)
-	assertSolanaDeployOnChain(t, rt, selector, cfg)
+		afterFirst[datastore.ContractType(mcmscontracts.RBACTimelockProgram)].Address)
 
+	// Re-running the changeset must be idempotent: no addresses should change.
 	execSolanaDeployChangeset(t, rt, selector, cfg)
 	afterSecond := assertSolanaDeployDatastoreRefs(t, rt, selector)
-
 	for ct, ref := range afterFirst {
 		require.Equal(t, ref.Address, afterSecond[ct].Address, "address changed for %s on re-run", ct)
 	}