update tests and toml for rmn ugprade

smartcontractkit · Nov 19, 2024 · 4e94f78 · 4e94f78
1 parent 6f95b09
commit 4e94f78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/deployment/environment/devenv/rmn_config.go b/deployment/environment/devenv/rmn_config.go
@@ -33,7 +33,7 @@ type SharedConfigNetworking struct {
 type HomeChain struct {
 	Name                 string `toml:"name"`
 	CapabilitiesRegistry string `toml:"capabilities_registry"`
-	CCIPConfig           string `toml:"ccip_config"`
+	CCIPHome             string `toml:"ccip_home"`
 	RMNHome              string `toml:"rmn_home"`
 }
 

diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go
@@ -2,6 +2,7 @@ package testsetups
 
 import (
 	"fmt"
+	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
 	"math/big"
 	"os"
 	"strconv"
@@ -143,6 +144,12 @@ func NewLocalDevEnvironmentWithRMN(
 
 	// Deploy CCIP contracts.
 	newAddresses := deployment.NewMemoryAddressBook()
+	preReqChangeset, err := changeset.DeployPrerequisites(tenv.Env, changeset.DeployPrerequisiteConfig{
+		ChainSelectors: tenv.Env.AllChainSelectors(),
+	})
+	require.NoError(t, err)
+	require.NoError(t, tenv.Env.ExistingAddresses.Merge(preReqChangeset.AddressBook))
+
 	err = ccipdeployment.DeployCCIPContracts(tenv.Env, newAddresses, ccipdeployment.DeployCCIPContractConfig{
 		HomeChainSel:   tenv.HomeChainSel,
 		FeedChainSel:   tenv.FeedChainSel,
@@ -239,7 +246,7 @@ func GenerateTestRMNConfig(t *testing.T, nRMNNodes int, tenv ccipdeployment.Depl
 		HomeChain: devenv.HomeChain{
 			Name:                 MustCCIPNameToRMNName(hc.Name),
 			CapabilitiesRegistry: state.Chains[tenv.HomeChainSel].CapabilityRegistry.Address().String(),
-			CCIPConfig:           state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
+			CCIPHome:             state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
 			RMNHome:              state.Chains[tenv.HomeChainSel].RMNHome.Address().String(),
 		},
 		RemoteChains: remoteChains,