remove deployCCIPContracts (#15586)

deployment/ccip/changeset/cs_add_chain_test.go

@@ -80,10 +80,23 @@ func TestAddChainInbound(t *testing.T) {
 	for _, chain := range initialDeploy {
 		chainConfig[chain] = DefaultOCRParams(e.FeedChainSel, nil, nil)
 	}
-	err = deployCCIPContracts(e.Env, newAddresses, NewChainsConfig{
+	newChainCfg := NewChainsConfig{
 		HomeChainSel:       e.HomeChainSel,
 		FeedChainSel:       e.FeedChainSel,
 		ChainConfigByChain: chainConfig,
+	}
+	e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, nil, []commonchangeset.ChangesetApplication{
+		{
+			Changeset: commonchangeset.WrapChangeSet(DeployChainContracts),
+			Config: DeployChainContractsConfig{
+				ChainSelectors:    newChainCfg.Chains(),
+				HomeChainSelector: newChainCfg.HomeChainSel,
+			},
+		},
+		{
+			Changeset: commonchangeset.WrapChangeSet(ConfigureNewChains),
+			Config:    newChainCfg,
+		},
 	})
 	require.NoError(t, err)
 

deployment/ccip/changeset/cs_deploy_chain.go

@@ -65,38 +65,6 @@ func (c DeployChainContractsConfig) Validate() error {
 	return nil
 }
 
-// deployCCIPContracts assumes the following contracts are deployed:
-// - Capability registry
-// - CCIP home
-// - RMN home
-// - Fee tokens on all chains.
-// and present in ExistingAddressBook.
-// It then deploys the rest of the CCIP chain contracts to the selected chains
-// registers the nodes with the capability registry and creates a DON for
-// each new chain.
-func deployCCIPContracts(
-	e deployment.Environment,
-	ab deployment.AddressBook,
-	c NewChainsConfig) error {
-	err := deployChainContractsForChains(e, ab, c.HomeChainSel, c.Chains())
-	if err != nil {
-		e.Logger.Errorw("Failed to deploy chain contracts", "err", err)
-		return err
-	}
-	err = e.ExistingAddresses.Merge(ab)
-	if err != nil {
-		e.Logger.Errorw("Failed to merge address book", "err", err)
-		return err
-	}
-	err = configureChain(e, c)
-	if err != nil {
-		e.Logger.Errorw("Failed to add chain", "err", err)
-		return err
-	}
-
-	return nil
-}
-
 func deployChainContractsForChains(
 	e deployment.Environment,
 	ab deployment.AddressBook,