From eb0b32fe2d9e1fd25b7561c1235015a2c2b164c8 Mon Sep 17 00:00:00 2001 From: Mateusz Sekara Date: Tue, 19 Nov 2024 17:22:14 +0100 Subject: [PATCH] Revert --- integration-tests/go.mod | 2 +- integration-tests/smoke/ccip_usdc_test.go | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 0ebd1419c2c..f3440a4db55 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -36,6 +36,7 @@ require ( github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chain-selectors v1.0.29 github.com/smartcontractkit/chainlink-automation v0.8.1 + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec github.com/smartcontractkit/chainlink-common v0.3.1-0.20241114134822-aadff98ef068 github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 @@ -413,7 +414,6 @@ require ( github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86 // indirect - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec // indirect github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241018134907-a00ba3729b5e // indirect github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect diff --git a/integration-tests/smoke/ccip_usdc_test.go b/integration-tests/smoke/ccip_usdc_test.go index 255cad2cd42..8abeb8ee17e 100644 --- a/integration-tests/smoke/ccip_usdc_test.go +++ b/integration-tests/smoke/ccip_usdc_test.go @@ -1,6 +1,8 @@ package smoke import ( + cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3" + "github.com/smartcontractkit/chainlink-ccip/pluginconfig" "math/big" "net/http" "net/http/httptest" @@ -47,10 +49,23 @@ func TestUSDCTokenTransfer(t *testing.T) { } e := tenv.Env + state, err := ccdeploy.LoadOnchainState(e) + require.NoError(t, err) + allChainSelectors := maps.Keys(e.Chains) sourceChain := allChainSelectors[0] destChain := allChainSelectors[1] + feeds := state.Chains[tenv.FeedChainSel].USDFeeds + tokenConfig := ccdeploy.NewTokenConfig() + tokenConfig.UpsertTokenInfo(ccdeploy.LinkSymbol, + pluginconfig.TokenInfo{ + AggregatorAddress: cciptypes.UnknownEncodedAddress(feeds[ccdeploy.LinkSymbol].Address().String()), + Decimals: ccdeploy.LinkDecimals, + DeviationPPB: cciptypes.NewBigIntFromInt64(1e9), + }, + ) + output, err := changeset.DeployPrerequisites(e, changeset.DeployPrerequisiteConfig{ ChainSelectors: e.AllChainSelectors(), }) @@ -62,7 +77,7 @@ func TestUSDCTokenTransfer(t *testing.T) { HomeChainSel: tenv.HomeChainSel, FeedChainSel: tenv.FeedChainSel, ChainsToDeploy: e.AllChainSelectors(), - TokenConfig: ccdeploy.NewTokenConfig(), + TokenConfig: tokenConfig, MCMSConfig: ccdeploy.NewTestMCMSConfig(t, e), OCRSecrets: deployment.XXXGenerateTestOCRSecrets(), USDCConfig: ccdeploy.USDCConfig{ @@ -77,7 +92,7 @@ func TestUSDCTokenTransfer(t *testing.T) { require.NoError(t, err) require.NoError(t, e.ExistingAddresses.Merge(output.AddressBook)) - state, err := ccdeploy.LoadOnchainState(e) + state, err = ccdeploy.LoadOnchainState(e) require.NoError(t, err) srcUSDC, dstUSDC, err := ccdeploy.ConfigureUSDCTokenPools(lggr, e.Chains, sourceChain, destChain, state)