refactor helper to use in cli in CLD (#15647)

* refactor helper to use in cli in CLD

* cleanup cfg and validation

* fix tests

* parallel ccip tests

* refactor mcms utils

* ccip wait timeout tests

* fix oversights

deployment/ccip/changeset/accept_ownership_test.go

@@ -9,9 +9,11 @@ import (
 	"golang.org/x/exp/maps"
 
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 )
 
 func Test_NewAcceptOwnershipChangeset(t *testing.T) {
+	t.Parallel()
 	e := NewMemoryEnvironment(t)
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
@@ -20,12 +22,12 @@ func Test_NewAcceptOwnershipChangeset(t *testing.T) {
 	source := allChains[0]
 	dest := allChains[1]
 
-	timelockContracts := map[uint64]*commonchangeset.TimelockExecutionContracts{
-		source: &commonchangeset.TimelockExecutionContracts{
+	timelockContracts := map[uint64]*proposalutils.TimelockExecutionContracts{
+		source: &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[source].Timelock,
 			CallProxy: state.Chains[source].CallProxy,
 		},
-		dest: &commonchangeset.TimelockExecutionContracts{
+		dest: &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[dest].Timelock,
 			CallProxy: state.Chains[dest].CallProxy,
 		},

deployment/ccip/changeset/cs_add_chain_test.go

@@ -1,12 +1,12 @@
 package changeset
 
 import (
-	"math/big"
 	"testing"
 	"time"
 
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/internal"
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/types"
 
@@ -30,6 +30,7 @@ import (
 )
 
 func TestAddChainInbound(t *testing.T) {
+	t.Parallel()
 	// 4 chains where the 4th is added after initial deployment.
 	e := NewMemoryEnvironment(t,
 		WithChains(4),
@@ -46,12 +47,7 @@ func TestAddChainInbound(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, e.Env.ExistingAddresses.Merge(newAddresses))
 
-	cfg := commontypes.MCMSWithTimelockConfig{
-		Canceller:        commonchangeset.SingleGroupMCMS(t),
-		Bypasser:         commonchangeset.SingleGroupMCMS(t),
-		Proposer:         commonchangeset.SingleGroupMCMS(t),
-		TimelockMinDelay: big.NewInt(0),
-	}
+	cfg := proposalutils.SingleGroupTimelockConfig(t)
 	e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, nil, []commonchangeset.ChangesetApplication{
 		{
 			Changeset: commonchangeset.WrapChangeSet(commonchangeset.DeployLinkToken),
@@ -152,7 +148,7 @@ func TestAddChainInbound(t *testing.T) {
 	}
 
 	// transfer ownership to timelock
-	_, err = commonchangeset.ApplyChangesets(t, e.Env, map[uint64]*commonchangeset.TimelockExecutionContracts{
+	_, err = commonchangeset.ApplyChangesets(t, e.Env, map[uint64]*proposalutils.TimelockExecutionContracts{
 		initialDeploy[0]: {
 			Timelock:  state.Chains[initialDeploy[0]].Timelock,
 			CallProxy: state.Chains[initialDeploy[0]].CallProxy,
@@ -194,7 +190,7 @@ func TestAddChainInbound(t *testing.T) {
 		nodeIDs = append(nodeIDs, node.NodeID)
 	}
 
-	_, err = commonchangeset.ApplyChangesets(t, e.Env, map[uint64]*commonchangeset.TimelockExecutionContracts{
+	_, err = commonchangeset.ApplyChangesets(t, e.Env, map[uint64]*proposalutils.TimelockExecutionContracts{
 		e.HomeChainSel: {
 			Timelock:  state.Chains[e.HomeChainSel].Timelock,
 			CallProxy: state.Chains[e.HomeChainSel].CallProxy,

deployment/ccip/changeset/cs_add_lane_test.go

@@ -16,6 +16,7 @@ import (
 )
 
 func TestAddLanesWithTestRouter(t *testing.T) {
+	t.Parallel()
 	e := NewMemoryEnvironment(t)
 	// Here we have CR + nodes set up, but no CCIP contracts deployed.
 	state, err := LoadOnchainState(e.Env)

deployment/ccip/changeset/cs_ccip_home_test.go

@@ -27,7 +27,7 @@ import (
 
 func TestActiveCandidate(t *testing.T) {
 	t.Skipf("to be enabled after latest cl-ccip is compatible")
-
+	t.Parallel()
 	tenv := NewMemoryEnvironment(t,
 		WithChains(3),
 		WithNodes(5))
@@ -86,9 +86,9 @@ func TestActiveCandidate(t *testing.T) {
 	ConfirmExecWithSeqNrsForAll(t, e, state, expectedSeqNumExec, startBlocks)
 
 	// compose the transfer ownership and accept ownership changesets
-	timelockContracts := make(map[uint64]*commonchangeset.TimelockExecutionContracts)
+	timelockContracts := make(map[uint64]*proposalutils.TimelockExecutionContracts)
 	for _, chain := range allChains {
-		timelockContracts[chain] = &commonchangeset.TimelockExecutionContracts{
+		timelockContracts[chain] = &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[chain].Timelock,
 			CallProxy: state.Chains[chain].CallProxy,
 		}
@@ -176,8 +176,8 @@ func TestActiveCandidate(t *testing.T) {
 		Batch:           setCommitCandidateOp,
 	}}, "set new candidates on commit plugin", 0)
 	require.NoError(t, err)
-	setCommitCandidateSigned := commonchangeset.SignProposal(t, e, setCommitCandidateProposal)
-	commonchangeset.ExecuteProposal(t, e, setCommitCandidateSigned, &commonchangeset.TimelockExecutionContracts{
+	setCommitCandidateSigned := proposalutils.SignProposal(t, e, setCommitCandidateProposal)
+	proposalutils.ExecuteProposal(t, e, setCommitCandidateSigned, &proposalutils.TimelockExecutionContracts{
 		Timelock:  state.Chains[tenv.HomeChainSel].Timelock,
 		CallProxy: state.Chains[tenv.HomeChainSel].CallProxy,
 	}, tenv.HomeChainSel)
@@ -197,8 +197,8 @@ func TestActiveCandidate(t *testing.T) {
 		Batch:           setExecCandidateOp,
 	}}, "set new candidates on commit and exec plugins", 0)
 	require.NoError(t, err)
-	setExecCandidateSigned := commonchangeset.SignProposal(t, e, setExecCandidateProposal)
-	commonchangeset.ExecuteProposal(t, e, setExecCandidateSigned, &commonchangeset.TimelockExecutionContracts{
+	setExecCandidateSigned := proposalutils.SignProposal(t, e, setExecCandidateProposal)
+	proposalutils.ExecuteProposal(t, e, setExecCandidateSigned, &proposalutils.TimelockExecutionContracts{
 		Timelock:  state.Chains[tenv.HomeChainSel].Timelock,
 		CallProxy: state.Chains[tenv.HomeChainSel].CallProxy,
 	}, tenv.HomeChainSel)
@@ -234,8 +234,8 @@ func TestActiveCandidate(t *testing.T) {
 		Batch:           promoteOps,
 	}}, "promote candidates and revoke actives", 0)
 	require.NoError(t, err)
-	promoteSigned := commonchangeset.SignProposal(t, e, promoteProposal)
-	commonchangeset.ExecuteProposal(t, e, promoteSigned, &commonchangeset.TimelockExecutionContracts{
+	promoteSigned := proposalutils.SignProposal(t, e, promoteProposal)
+	proposalutils.ExecuteProposal(t, e, promoteSigned, &proposalutils.TimelockExecutionContracts{
 		Timelock:  state.Chains[tenv.HomeChainSel].Timelock,
 		CallProxy: state.Chains[tenv.HomeChainSel].CallProxy,
 	}, tenv.HomeChainSel)
@@ -298,7 +298,7 @@ func Test_PromoteCandidate(t *testing.T) {
 
 			if tc.mcmsEnabled {
 				// Transfer ownership to timelock so that we can promote the zero digest later down the line.
-				_, err = commonchangeset.ApplyChangesets(t, tenv.Env, map[uint64]*commonchangeset.TimelockExecutionContracts{
+				_, err = commonchangeset.ApplyChangesets(t, tenv.Env, map[uint64]*proposalutils.TimelockExecutionContracts{
 					source: {
 						Timelock:  state.Chains[source].Timelock,
 						CallProxy: state.Chains[source].CallProxy,
@@ -345,7 +345,7 @@ func Test_PromoteCandidate(t *testing.T) {
 					MinDelay: 0,
 				}
 			}
-			_, err = commonchangeset.ApplyChangesets(t, tenv.Env, map[uint64]*commonchangeset.TimelockExecutionContracts{
+			_, err = commonchangeset.ApplyChangesets(t, tenv.Env, map[uint64]*proposalutils.TimelockExecutionContracts{
 				tenv.HomeChainSel: {
 					Timelock:  state.Chains[tenv.HomeChainSel].Timelock,
 					CallProxy: state.Chains[tenv.HomeChainSel].CallProxy,

deployment/ccip/changeset/cs_deploy_chain_test.go

@@ -3,20 +3,21 @@ package changeset
 import (
 	"encoding/json"
 	"fmt"
-	"math/big"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestDeployChainContractsChangeset(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
 		Bootstraps: 1,
@@ -30,12 +31,7 @@ func TestDeployChainContractsChangeset(t *testing.T) {
 	p2pIds := nodes.NonBootstraps().PeerIDs()
 	cfg := make(map[uint64]commontypes.MCMSWithTimelockConfig)
 	for _, chain := range e.AllChainSelectors() {
-		cfg[chain] = commontypes.MCMSWithTimelockConfig{
-			Canceller:        commonchangeset.SingleGroupMCMS(t),
-			Bypasser:         commonchangeset.SingleGroupMCMS(t),
-			Proposer:         commonchangeset.SingleGroupMCMS(t),
-			TimelockMinDelay: big.NewInt(0),
-		}
+		cfg[chain] = proposalutils.SingleGroupTimelockConfig(t)
 	}
 	e, err = commonchangeset.ApplyChangesets(t, e, nil, []commonchangeset.ChangesetApplication{
 		{
@@ -98,6 +94,7 @@ func TestDeployChainContractsChangeset(t *testing.T) {
 }
 
 func TestDeployCCIPContracts(t *testing.T) {
+	t.Parallel()
 	e := NewMemoryEnvironment(t)
 	// Deploy all the CCIP contracts.
 	state, err := LoadOnchainState(e.Env)

deployment/ccip/changeset/cs_home_chain_test.go

@@ -13,6 +13,7 @@ import (
 )
 
 func TestDeployHomeChain(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
 		Bootstraps: 1,

deployment/ccip/changeset/cs_initial_add_chain_test.go

@@ -9,10 +9,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 )
 
 func TestInitialAddChainAppliedTwice(t *testing.T) {
+	t.Parallel()
 	// This already applies the initial add chain changeset.
 	e := NewMemoryEnvironment(t)
 
@@ -24,10 +26,10 @@ func TestInitialAddChainAppliedTwice(t *testing.T) {
 	allChains := e.Env.AllChainSelectors()
 	tokenConfig := NewTestTokenConfig(state.Chains[e.FeedChainSel].USDFeeds)
 	chainConfigs := make(map[uint64]CCIPOCRParams)
-	timelockContractsPerChain := make(map[uint64]*commonchangeset.TimelockExecutionContracts)
+	timelockContractsPerChain := make(map[uint64]*proposalutils.TimelockExecutionContracts)
 
 	for _, chain := range allChains {
-		timelockContractsPerChain[chain] = &commonchangeset.TimelockExecutionContracts{
+		timelockContractsPerChain[chain] = &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[chain].Timelock,
 			CallProxy: state.Chains[chain].CallProxy,
 		}

deployment/ccip/changeset/cs_jobspec_test.go

@@ -13,6 +13,7 @@ import (
 )
 
 func TestJobSpecChangeset(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
 		Chains: 1,

deployment/ccip/changeset/cs_update_rmn_config.go

@@ -12,7 +12,6 @@ import (
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/mcms"
 	"github.com/smartcontractkit/ccip-owner-contracts/pkg/proposal/timelock"
 	"github.com/smartcontractkit/chainlink/deployment"
-	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_remote"
@@ -304,10 +303,10 @@ func NewPromoteCandidateConfigChangeset(e deployment.Environment, config Promote
 	}, nil
 }
 
-func buildTimelockPerChain(e deployment.Environment, state CCIPOnChainState) map[uint64]*commonchangeset.TimelockExecutionContracts {
-	timelocksPerChain := make(map[uint64]*commonchangeset.TimelockExecutionContracts)
+func buildTimelockPerChain(e deployment.Environment, state CCIPOnChainState) map[uint64]*proposalutils.TimelockExecutionContracts {
+	timelocksPerChain := make(map[uint64]*proposalutils.TimelockExecutionContracts)
 	for _, chain := range e.Chains {
-		timelocksPerChain[chain.Selector] = &commonchangeset.TimelockExecutionContracts{
+		timelocksPerChain[chain.Selector] = &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[chain.Selector].Timelock,
 			CallProxy: state.Chains[chain.Selector].CallProxy,
 		}

deployment/ccip/changeset/cs_update_rmn_config_test.go

@@ -56,6 +56,7 @@ func TestUpdateRMNConfig(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			updateRMNConfig(t, tc)
 		})
 	}

deployment/ccip/changeset/test_assertions.go

@@ -221,8 +221,8 @@ func ConfirmCommitForAllWithExpectedSeqNums(
 			return false
 		}
 	},
-		3*time.Minute,
-		1*time.Second,
+		tests.WaitTimeout(t),
+		2*time.Second,
 		"all commitments did not confirm",
 	)
 }

deployment/ccip/changeset/test_environment.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
 )
@@ -299,12 +300,7 @@ func NewEnvironmentWithJobsAndContracts(t *testing.T, tc *TestConfigs, tEnv Test
 	mcmsCfg := make(map[uint64]commontypes.MCMSWithTimelockConfig)
 
 	for _, c := range e.Env.AllChainSelectors() {
-		mcmsCfg[c] = commontypes.MCMSWithTimelockConfig{
-			Canceller:        commonchangeset.SingleGroupMCMS(t),
-			Bypasser:         commonchangeset.SingleGroupMCMS(t),
-			Proposer:         commonchangeset.SingleGroupMCMS(t),
-			TimelockMinDelay: big.NewInt(0),
-		}
+		mcmsCfg[c] = proposalutils.SingleGroupTimelockConfig(t)
 	}
 	var (
 		usdcChains   []uint64
@@ -382,9 +378,9 @@ func NewEnvironmentWithJobsAndContracts(t *testing.T, tc *TestConfigs, tEnv Test
 	}
 	// Build the per chain config.
 	chainConfigs := make(map[uint64]CCIPOCRParams)
-	timelockContractsPerChain := make(map[uint64]*commonchangeset.TimelockExecutionContracts)
+	timelockContractsPerChain := make(map[uint64]*proposalutils.TimelockExecutionContracts)
 	for _, chain := range allChains {
-		timelockContractsPerChain[chain] = &commonchangeset.TimelockExecutionContracts{
+		timelockContractsPerChain[chain] = &proposalutils.TimelockExecutionContracts{
 			Timelock:  state.Chains[chain].Timelock,
 			CallProxy: state.Chains[chain].CallProxy,
 		}

deployment/ccip/changeset/view_test.go

@@ -7,6 +7,7 @@ import (
 )
 
 func TestSmokeView(t *testing.T) {
+	t.Parallel()
 	tenv := NewMemoryEnvironment(t, WithChains(3))
 	_, err := ViewCCIP(tenv.Env)
 	require.NoError(t, err)

deployment/common/changeset/internal/mcms_test.go

@@ -2,7 +2,6 @@ package internal_test
 
 import (
 	"encoding/json"
-	"math/big"
 	"testing"
 
 	chainsel "github.com/smartcontractkit/chain-selectors"
@@ -11,6 +10,7 @@ import (
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/changeset/internal"
+	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	"github.com/smartcontractkit/chainlink/deployment/common/types"
 	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -23,7 +23,7 @@ func TestDeployMCMSWithConfig(t *testing.T) {
 	})
 	ab := deployment.NewMemoryAddressBook()
 	_, err := internal.DeployMCMSWithConfig(types.ProposerManyChainMultisig,
-		lggr, chains[chainsel.TEST_90000001.Selector], ab, changeset.SingleGroupMCMS(t))
+		lggr, chains[chainsel.TEST_90000001.Selector], ab, proposalutils.SingleGroupMCMS(t))
 	require.NoError(t, err)
 }
 
@@ -35,12 +35,7 @@ func TestDeployMCMSWithTimelockContracts(t *testing.T) {
 	ab := deployment.NewMemoryAddressBook()
 	_, err := internal.DeployMCMSWithTimelockContracts(lggr,
 		chains[chainsel.TEST_90000001.Selector],
-		ab, types.MCMSWithTimelockConfig{
-			Canceller:        changeset.SingleGroupMCMS(t),
-			Bypasser:         changeset.SingleGroupMCMS(t),
-			Proposer:         changeset.SingleGroupMCMS(t),
-			TimelockMinDelay: big.NewInt(0),
-		})
+		ab, proposalutils.SingleGroupTimelockConfig(t))
 	require.NoError(t, err)
 	addresses, err := ab.AddressesForChain(chainsel.TEST_90000001.Selector)
 	require.NoError(t, err)