Ccip memory test refactor #20377

jkongie · 2025-11-19T08:19:17Z

wip

trunk-io · 2025-11-19T13:11:52Z

_{View Full Report ↗︎ ⋅ Docs}

Copilot

Pull Request Overview

This PR refactors CCIP memory test setup and configuration to use new environment initialization patterns. The changes standardize how test environments are created and configured across the codebase.

Key changes:

Replaces WithChainIDs with WithEVMChainsBySelectors to use chain selectors instead of chain IDs
Updates environment creation to use environment.New() instead of memory.NewMemoryEnvironment()
Adds new utility functions for loading Solana and TON program artifacts
Standardizes node registration with new RegisterNodes() helper function

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
integration-tests/smoke/ccip/ccip_topologies_test.go	Simplified chain selection by directly assigning selectors and removed sorting logic
integration-tests/smoke/ccip/ccip_migration_to_v_1_6_test.go	Updated to use chain selectors instead of chain IDs
integration-tests/smoke/ccip/ccip_messaging_test.go	Updated to use chain selectors instead of chain IDs
deployment/internal/tontestutils/sha.go	Added new utility to extract TON contract SHA from go.mod
deployment/internal/soltestutils/preload.go	Added LoadCCIPPrograms function to load CCIP program artifacts
deployment/common/changeset/solana/mcms/mcms.go	Fixed bug where wrong program ID was used in waitForProgramDeployment calls
deployment/ccip/changeset/v1_6/cs_translate_onramp_to_feequoter_test.go	Removed unused variable and simplified chain selector handling
deployment/ccip/changeset/v1_6/cs_home_chain_test.go	Replaced memory environment with new environment.New() pattern
deployment/ccip/changeset/v1_6/cs_deploy_chain_test.go	Replaced memory environment with new environment.New() pattern
deployment/ccip/changeset/v1_6/cs_chain_contracts_test.go	Updated to use chain selectors instead of chain IDs
deployment/ccip/changeset/v1_6/cs_add_new_chain_e2e_test.go	Updated to use chain selectors instead of chain IDs
deployment/ccip/changeset/v1_6/accept_ownership_test.go	Removed redundant state loading
deployment/ccip/changeset/v1_5/e2e_test.go	Updated to use chain selectors instead of chain IDs
deployment/ccip/changeset/testhelpers/test_environment.go	Major refactor to use new environment loader and added RegisterNodes helper
deployment/ccip/changeset/solana_v0_1_1/transfer_ccip_to_mcms_with_timelock_test.go	Updated to use new environment pattern with Solana container
deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain_test.go	Updated to use new environment pattern with Solana container
deployment/ccip/changeset/aptos/cs_add_token_pool_test.go	Commented out quarantine.Flaky call

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-19T14:44:14Z

deployment/internal/tontestutils/sha.go

+}
+
+func getModFilePath() (string, error) {
+	_, currentFile, _, _ := runtime.Caller(0)


Error return value from runtime.Caller(0) is ignored. If runtime.Caller fails (returns false in the 4th return value), the function should handle this error case instead of proceeding with potentially invalid values.

Suggested change

_, currentFile, _, _ := runtime.Caller(0)

_, currentFile, _, ok := runtime.Caller(0)

if !ok {

return "", errors.New("runtime.Caller failed to retrieve current file")

}

Copilot · 2025-11-19T14:44:14Z

deployment/ccip/changeset/testhelpers/test_environment.go

+	client, ok := env.Offchain.(*simjd.MemoryJobDistributor)
+	require.True(t, ok)
+
+	nodeIDs := make([]string, 4)


The slice nodeIDs is initialized with a fixed size of 4 on line 1710, but the function parameter numNodes is used in the loop on line 1711. This creates a mismatch when numNodes != 4, potentially causing an index out of bounds error. The slice should be initialized with make([]string, numNodes) instead.

Suggested change

nodeIDs := make([]string, 4)

nodeIDs := make([]string, numNodes)

jkongie · 2025-11-20T08:50:14Z

deployment/common/changeset/solana/mcms/mcms.go

-		return nil, fmt.Errorf("access controller program not ready: %w", err)
+		return nil, fmt.Errorf("failed to deploy timelock program: %w", err)
 	}
+	err = waitForProgramDeployment(e.GetContext(), chain.Client, chainState.TimelockProgram, 30*time.Second)


Fixed waiting on incorrect program

jkongie · 2025-11-20T08:50:23Z

deployment/common/changeset/solana/mcms/mcms.go

-		return nil, fmt.Errorf("access controller program not ready: %w", err)
+		return nil, fmt.Errorf("failed to deploy mcm program: %w", err)
 	}
+	err = waitForProgramDeployment(e.GetContext(), chain.Client, chainState.McmProgram, 30*time.Second)


Fixed waiting on incorrect program

jkongie · 2025-11-20T08:51:11Z

deployment/ccip/changeset/v1_6/cs_translate_onramp_to_feequoter_test.go


-	allChains := tenv.BlockChains.ListChainSelectors(
-		cldf_chain.WithFamily(chain_selectors.FamilyEVM),
-		cldf_chain.WithChainSelectorsExclusion([]uint64{chain_selectors.GETH_TESTNET.Selector}),


Unneeded call to List since we already have the selectors

jkongie · 2025-11-20T08:52:24Z

deployment/ccip/changeset/v1_6/cs_chain_contracts_test.go

-		testhelpers.WithNumOfChains(3),
-		testhelpers.WithChainIDs([]uint64{chainselectors.GETH_TESTNET.EvmChainID}))


Chaanged to directly specify the chains instead of using a combination of N chains and direct selectors

jkongie · 2025-11-20T08:53:03Z

deployment/ccip/changeset/v1_6/accept_ownership_test.go

 	t.Parallel()
 	e, _ := testhelpers.NewMemoryEnvironment(t)
-	state, err := stateview.LoadOnchainState(e.Env)
+	_, err := stateview.LoadOnchainState(e.Env)


The state var was unused

jkongie · 2025-11-20T08:53:12Z

deployment/ccip/changeset/v1_5/e2e_test.go

+		// testhelpers.WithNumOfChains(3),
+		testhelpers.WithEVMChainsBySelectors([]uint64{
+			chainselectors.GETH_TESTNET.Selector,
+			chainselectors.TEST_90000001.Selector,
+			chainselectors.TEST_90000002.Selector,
+		}),
+	)


Chaanged to directly specify the chains instead of using a combination of N chains and direct selectors

github-actions · 2025-11-21T13:21:00Z

CORA - Pending Reviewers

Codeowners Entry	Overall	Num Files	Owners
`/integration-tests/*/ccip*`	💬	3	@smartcontractkit/ccip-offchain, @smartcontractkit/core, @smartcontractkit/ccip
`/deployment`	💬	2	@smartcontractkit/ccip-tooling, @smartcontractkit/ccip-offchain, @smartcontractkit/keystone, @smartcontractkit/core, @smartcontractkit/cld-team
`/deployment/common`	⏳	1	@smartcontractkit/devex-tooling
`/deployment/ccip`	💬	10	@smartcontractkit/ccip-tooling, @smartcontractkit/ccip-offchain, @smartcontractkit/core, @smartcontractkit/cld-team

For more details, see the full review summary.

jkongie · 2025-11-21T15:26:54Z

deployment/ccip/changeset/testhelpers/test_environment.go

 	TonChains                  int      // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
-	ChainIDs                   []uint64 // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
-	NumOfUsersPerChain         int      // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
+	EVMChainsBySelectors       []uint64 // only used in memory mode, for docker mode, this is determined by the integration-test config toml input


Rename to make it clearer what it is doing

jkongie · 2025-11-21T15:27:32Z

deployment/ccip/changeset/testhelpers/test_environment.go

-	ChainIDs                   []uint64 // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
-	NumOfUsersPerChain         int      // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
+	EVMChainsBySelectors       []uint64 // only used in memory mode, for docker mode, this is determined by the integration-test config toml input
+	NumOfUsersPerChain         uint     // only used in memory mode, for docker mode, this is determined by the integration-test config toml input


Type change because this can not be less than 0 and it matches the expected value to the EVMContainer config

jkongie · 2025-11-21T15:28:20Z

deployment/ccip/changeset/testhelpers/test_environment.go

-		if tc.Chains > len(tc.ChainIDs) {
-			additionalChains := cldf_chain.NewBlockChainsFromSlice(
-				memory.NewMemoryChainsEVM(t, tc.Chains-len(tc.ChainIDs), tc.NumOfUsersPerChain),
-			)
-
-			maps.Copy(chains, additionalChains.EVMChains())
-
-			additionalUsers := usersMap(t, chains)
-			maps.Copy(users, additionalUsers)
-		}


This logic has been intentionally removed in favour of the caller explicitly providing the chain selectors they want to use.

The existing logic was confusing to use

jkongie · 2025-11-21T15:29:18Z

deployment/ccip/changeset/testhelpers/test_environment.go

+	nodeIDs := make([]string, 0, len(nodes))
+	for id, node := range nodes {
 		require.NoError(t, node.App.Start(ctx))
 		t.Cleanup(func() {
 			require.NoError(t, node.App.Stop())
 		})
+		nodeIDs = append(nodeIDs, id)
 	}
 	m.nodes = nodes


This had to be moved here to remove usage of NewMemoryEnvironmentFromChainsNodes

cl-sonarqube-production · 2025-11-21T15:46:04Z

Quality Gate passed

Issues
1 New issue
1 Fixed issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
6.9% Duplication on New Code

See analysis details on SonarQube

trunk-io

🔴 Test Results: SUI Chain Funding Regression

Affected failures:

Workflow Run: Run CCIP integration In Memory Tests For PR / smoke/ccip/ccip_sui_token_transfer_test.go:Test_CCIPTokenTransfer_EVM2SUI_ManagedTokenPool

What Broke

The refactoring of the SUI chain initialization in 'deployment/ccip/changeset/testhelpers/test_environment.go' introduced a regression that prevents the SUI chain from properly processing or reporting cross-chain commits, leading to a timeout.

Proposed Fixes

Add a funding mechanism for SUI chains in the test environment to ensure they have sufficient funds for operations, addressing a timeout issue related to commit report processing.

In test_environment.go:95

 var (
 	tonDeployerFundAmount = tlb.MustFromTON("1000")
+ 	suiDeployerFundAmount = sui_deployment.MustNewSuiCoin("1000")
 )
			utils.FundWallets(t, tonChain.Client, []*address.Address{tonChain.WalletAddress}, []tlb.Coins{tonDeployerFundAmount})
		}
	}
+ 
+ 	// Sui chains must be funded if they exist
+ 	if len(env.BlockChains.SuiChains()) > 0 {
+ 		for _, suiChain := range env.BlockChains.SuiChains() {
+ 			sui_deployment.FundWallets(t, suiChain.Client, []*sui.Address{suiChain.WalletAddress}, []sui_deployment.Coins{suiDeployerFundAmount})
+ 		}
+ 	}

	m.DeployedEnv = DeployedEnv{
		Env:          *env,

Autofix Options

You can apply the proposed fixes directly to your branch. Try the following:

Comment /trunk stack-fix fnBEbPou to generate a stacked PR with the proposed fixes.
Use MCP in your IDE to fix the issue. Try Help me fix CI failures from fnBEbPou to get started.

Tip

Get Better Results: This CI job is not uploading test reports. Adding structured test reports enables more precise, test-level analysis with better root cause identification and more targeted fix recommendations.
👉🏻 Learn how to upload test results.

trunk-io

🔴 Test Results: Unrelated Failure

Affected failures:

Workflow Run: Integration Tests

What Broke

Solana programs (Access Controller, MCM, Timelock) are not deploying or becoming ready within the expected timeframe in the new test environment setup. This issue is now correctly reported due to improved error handling. The PR refactors the test environment setup, migrating from a custom in-memory environment to a more generic framework. The improved error handling for Solana program deployments in deployment/common/changeset/solana/mcms/mcms.go likely exposed a pre-existing or newly introduced issue with Solana program readiness in the refactored environment.

Autofix Options

You can use our MCP server to get AI assistance with debugging and fixing these failures.

Use MCP in your IDE to debug the issue. Try Help me fix CI failures from tSVopD0D to get started.

View all test uploads

jkongie force-pushed the ccip-memory-removal branch 2 times, most recently from 7c2a091 to 236c72e Compare November 19, 2025 12:10

jkongie changed the title ~~Ccip memory removal~~ Ccip memory test refactor Nov 19, 2025

jkongie force-pushed the ccip-memory-removal branch 2 times, most recently from 272c255 to 11dd4e9 Compare November 19, 2025 13:01

jkongie force-pushed the ccip-memory-removal branch 4 times, most recently from 4adb949 to 30e5c91 Compare November 19, 2025 14:24

sebawo requested a review from Copilot November 19, 2025 14:43

Copilot AI reviewed Nov 19, 2025

View reviewed changes