Skip to content

Commit 05e24dc

Browse files
carte7000carte7000
authored
Update 1.5 migration test to avoid 1.6 jobspec (smartcontractkit#16742)
* Update 1.5 migration test to avoid 1.6 jobspec * Fix lint issues and remove curse_uncurse test * remove curse_uncurse test * Make test run nightly
1 parent 79bbad0 commit 05e24dc

File tree

2 files changed

+118
-5
lines changed

2 files changed

+118
-5
lines changed

‎.github/e2e-tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,6 @@ runner-test-matrix:
10241024
test_env_type: docker
10251025
runs_on: ubuntu-latest
10261026
triggers:
1027-
- PR E2E Core Tests
10281027
- Nightly E2E Tests
10291028
test_cmd: cd integration-tests && go test github.com/smartcontractkit/chainlink/integration-tests/smoke/ccip -v -run ^TestV1_5_Message_RMNRemote_Curse_Uncurse$ -timeout 18m -count=1 -test.parallel=1 -json
10301029
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated

‎integration-tests/smoke/ccip/ccip_migration_to_v_1_6_test.go

+118-4
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,46 @@ func TestV1_5_Message_RMNRemote(t *testing.T) {
9696
require.NoError(t, err)
9797
oldState, err := changeset.LoadOnchainState(e.Env)
9898
require.NoError(t, err)
99-
e = testhelpers.AddCCIPContractsToEnvironment(t, e.Env.AllChainSelectors(), tEnv, false)
99+
envNodes, err := deployment.NodeInfo(e.Env.NodeIDs, e.Env.Offchain)
100+
require.NoError(t, err)
101+
evmContractParams := make(map[uint64]v1_6.ChainContractParams)
102+
evmChains := []uint64{}
103+
for _, chain := range allChains {
104+
if _, ok := e.Env.Chains[chain]; ok {
105+
evmChains = append(evmChains, chain)
106+
}
107+
}
108+
for _, chain := range evmChains {
109+
evmContractParams[chain] = v1_6.ChainContractParams{
110+
FeeQuoterParams: v1_6.DefaultFeeQuoterParams(),
111+
OffRampParams: v1_6.DefaultOffRampParams(),
112+
}
113+
}
114+
var apps []commonchangeset.ConfiguredChangeSet
115+
apps = append(apps, []commonchangeset.ConfiguredChangeSet{
116+
commonchangeset.Configure(
117+
deployment.CreateLegacyChangeSet(v1_6.DeployHomeChainChangeset),
118+
v1_6.DeployHomeChainConfig{
119+
HomeChainSel: e.HomeChainSel,
120+
RMNDynamicConfig: testhelpers.NewTestRMNDynamicConfig(),
121+
RMNStaticConfig: testhelpers.NewTestRMNStaticConfig(),
122+
NodeOperators: testhelpers.NewTestNodeOperator(e.Env.Chains[e.HomeChainSel].DeployerKey.From),
123+
NodeP2PIDsPerNodeOpAdmin: map[string][][32]byte{
124+
testhelpers.TestNodeOperator: envNodes.NonBootstraps().PeerIDs(),
125+
},
126+
},
127+
),
128+
commonchangeset.Configure(
129+
deployment.CreateLegacyChangeSet(v1_6.DeployChainContractsChangeset),
130+
v1_6.DeployChainContractsConfig{
131+
HomeChainSelector: e.HomeChainSel,
132+
ContractParamsPerChain: evmContractParams,
133+
},
134+
),
135+
}...)
100136
// reload state after adding lanes
101-
137+
e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, nil, apps)
138+
require.NoError(t, err)
102139
tEnv.UpdateDeployedEnvironment(e)
103140

104141
_, err = deployment.CreateLegacyChangeSet(v1_6.SetRMNRemoteOnRMNProxyChangeset).Apply(e.Env,
@@ -185,7 +222,46 @@ func TestV1_5_Message_RMNRemote_Curse(t *testing.T) {
185222
require.NoError(t, err)
186223
oldState, err := changeset.LoadOnchainState(e.Env)
187224
require.NoError(t, err)
188-
e = testhelpers.AddCCIPContractsToEnvironment(t, e.Env.AllChainSelectors(), tEnv, false)
225+
envNodes, err := deployment.NodeInfo(e.Env.NodeIDs, e.Env.Offchain)
226+
require.NoError(t, err)
227+
evmContractParams := make(map[uint64]v1_6.ChainContractParams)
228+
evmChains := []uint64{}
229+
for _, chain := range allChains {
230+
if _, ok := e.Env.Chains[chain]; ok {
231+
evmChains = append(evmChains, chain)
232+
}
233+
}
234+
for _, chain := range evmChains {
235+
evmContractParams[chain] = v1_6.ChainContractParams{
236+
FeeQuoterParams: v1_6.DefaultFeeQuoterParams(),
237+
OffRampParams: v1_6.DefaultOffRampParams(),
238+
}
239+
}
240+
var apps []commonchangeset.ConfiguredChangeSet
241+
apps = append(apps, []commonchangeset.ConfiguredChangeSet{
242+
commonchangeset.Configure(
243+
deployment.CreateLegacyChangeSet(v1_6.DeployHomeChainChangeset),
244+
v1_6.DeployHomeChainConfig{
245+
HomeChainSel: e.HomeChainSel,
246+
RMNDynamicConfig: testhelpers.NewTestRMNDynamicConfig(),
247+
RMNStaticConfig: testhelpers.NewTestRMNStaticConfig(),
248+
NodeOperators: testhelpers.NewTestNodeOperator(e.Env.Chains[e.HomeChainSel].DeployerKey.From),
249+
NodeP2PIDsPerNodeOpAdmin: map[string][][32]byte{
250+
testhelpers.TestNodeOperator: envNodes.NonBootstraps().PeerIDs(),
251+
},
252+
},
253+
),
254+
commonchangeset.Configure(
255+
deployment.CreateLegacyChangeSet(v1_6.DeployChainContractsChangeset),
256+
v1_6.DeployChainContractsConfig{
257+
HomeChainSelector: e.HomeChainSel,
258+
ContractParamsPerChain: evmContractParams,
259+
},
260+
),
261+
}...)
262+
// reload state after adding lanes
263+
e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, nil, apps)
264+
require.NoError(t, err)
189265

190266
// reload state after adding lanes
191267
tEnv.UpdateDeployedEnvironment(e)
@@ -281,7 +357,45 @@ func TestV1_5_Message_RMNRemote_Curse_Uncurse(t *testing.T) {
281357
require.NoError(t, err)
282358
oldState, err := changeset.LoadOnchainState(e.Env)
283359
require.NoError(t, err)
284-
e = testhelpers.AddCCIPContractsToEnvironment(t, e.Env.AllChainSelectors(), tEnv, false)
360+
envNodes, err := deployment.NodeInfo(e.Env.NodeIDs, e.Env.Offchain)
361+
require.NoError(t, err)
362+
evmContractParams := make(map[uint64]v1_6.ChainContractParams)
363+
evmChains := []uint64{}
364+
for _, chain := range allChains {
365+
if _, ok := e.Env.Chains[chain]; ok {
366+
evmChains = append(evmChains, chain)
367+
}
368+
}
369+
for _, chain := range evmChains {
370+
evmContractParams[chain] = v1_6.ChainContractParams{
371+
FeeQuoterParams: v1_6.DefaultFeeQuoterParams(),
372+
OffRampParams: v1_6.DefaultOffRampParams(),
373+
}
374+
}
375+
var apps []commonchangeset.ConfiguredChangeSet
376+
apps = append(apps, []commonchangeset.ConfiguredChangeSet{
377+
commonchangeset.Configure(
378+
deployment.CreateLegacyChangeSet(v1_6.DeployHomeChainChangeset),
379+
v1_6.DeployHomeChainConfig{
380+
HomeChainSel: e.HomeChainSel,
381+
RMNDynamicConfig: testhelpers.NewTestRMNDynamicConfig(),
382+
RMNStaticConfig: testhelpers.NewTestRMNStaticConfig(),
383+
NodeOperators: testhelpers.NewTestNodeOperator(e.Env.Chains[e.HomeChainSel].DeployerKey.From),
384+
NodeP2PIDsPerNodeOpAdmin: map[string][][32]byte{
385+
testhelpers.TestNodeOperator: envNodes.NonBootstraps().PeerIDs(),
386+
},
387+
},
388+
),
389+
commonchangeset.Configure(
390+
deployment.CreateLegacyChangeSet(v1_6.DeployChainContractsChangeset),
391+
v1_6.DeployChainContractsConfig{
392+
HomeChainSelector: e.HomeChainSel,
393+
ContractParamsPerChain: evmContractParams,
394+
},
395+
),
396+
}...)
397+
e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, nil, apps)
398+
require.NoError(t, err)
285399
// reload state after adding lanes
286400

287401
state, err = changeset.LoadOnchainState(e.Env)

0 commit comments

Comments
 (0)