more fixes

smartcontractkit · Nov 26, 2024 · a8bc462 · a8bc462
1 parent 2952585
commit a8bc462
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/deployment/ccip/changeset/deploy.go b/deployment/ccip/changeset/deploy.go
@@ -446,9 +446,10 @@ func deployCCIPContracts(
 		e.Logger.Errorw("Failed to load existing onchain state", "err", err)
 		return err
 	}
-	tokenInfo := c.TokenConfig.GetTokenInfo(e.Logger, state.Chains[c.FeedChainSel].LinkToken, state.Chains[c.FeedChainSel].Weth9)
+
 	ocrParams := make(map[uint64]CCIPOCRParams)
 	for _, chain := range c.ChainsToDeploy {
+		tokenInfo := c.TokenConfig.GetTokenInfo(e.Logger, state.Chains[chain].LinkToken, state.Chains[chain].Weth9)
 		ocrParams[chain] = DefaultOCRParams(c.FeedChainSel, tokenInfo)
 	}
 	c.OCRParams = ocrParams

diff --git a/deployment/ccip/changeset/test_helpers.go b/deployment/ccip/changeset/test_helpers.go
@@ -330,9 +330,9 @@ func NewMemoryEnvironmentWithJobsAndContracts(t *testing.T, lggr logger.Logger,
 		})
 	}
 
-	tokenInfo := tokenConfig.GetTokenInfo(e.Env.Logger, state.Chains[e.FeedChainSel].LinkToken, state.Chains[e.FeedChainSel].Weth9)
 	for _, chain := range allChains {
 		timelocksPerChain[chain] = state.Chains[chain].Timelock
+		tokenInfo := tokenConfig.GetTokenInfo(e.Env.Logger, state.Chains[chain].LinkToken, state.Chains[chain].Weth9)
 		ocrParams[chain] = DefaultOCRParams(e.FeedChainSel, tokenInfo)
 	}
 	// Deploy second set of changesets to deploy and configure the CCIP contracts.

diff --git a/integration-tests/testsetups/test_helpers.go b/integration-tests/testsetups/test_helpers.go
@@ -219,9 +219,10 @@ func NewLocalDevEnvironment(
 	}
 	require.NotNil(t, state.Chains[feedSel].LinkToken)
 	require.NotNil(t, state.Chains[feedSel].Weth9)
-	tokenInfo := tokenConfig.GetTokenInfo(env.Logger, state.Chains[feedSel].LinkToken, state.Chains[feedSel].Weth9)
+
 	for _, chain := range allChains {
 		timelocksPerChain[chain] = state.Chains[chain].Timelock
+		tokenInfo := tokenConfig.GetTokenInfo(env.Logger, state.Chains[chain].LinkToken, state.Chains[chain].Weth9)
 		ocrParams[chain] = changeset.DefaultOCRParams(feedSel, tokenInfo)
 	}
 	// Deploy second set of changesets to deploy and configure the CCIP contracts.