Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e0efbcc

Browse files
authoredMay 13, 2025
Reorganize packages with state in a new shared package (#17681)
* reorganize packages * fix import cycle * compile fix * fix imports * more fixes * fix error
1 parent fa6e63f commit e0efbcc

File tree

119 files changed

+4213
-3996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+4213
-3996
lines changed
 

‎deployment/ccip/changeset/crossfamily/v1_6/cs_add_evm_solana_lane.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
1515

1616
"github.com/smartcontractkit/chainlink/deployment"
17-
ccipchangeset "github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
1817
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana"
1918
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_6"
19+
"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
2020
commonstate "github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
2121
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
2222
)
@@ -269,7 +269,7 @@ type AddRemoteChainE2EConfig struct {
269269
MCMSConfig *proposalutils.TimelockConfig
270270
}
271271

272-
func (cfg *AddRemoteChainE2EConfig) populateAndValidateIndividualCSConfig(env deployment.Environment, evmState ccipchangeset.CCIPOnChainState) (csInputs, error) {
272+
func (cfg *AddRemoteChainE2EConfig) populateAndValidateIndividualCSConfig(env deployment.Environment, evmState stateview.CCIPOnChainState) (csInputs, error) {
273273
var timelockConfig *proposalutils.TimelockConfig
274274
if cfg.MCMSConfig != nil {
275275
timelockConfig = cfg.MCMSConfig
@@ -381,7 +381,7 @@ func (cfg *AddRemoteChainE2EConfig) populateAndValidateIndividualCSConfig(env de
381381
}
382382

383383
func addEVMSolanaPreconditions(env deployment.Environment, input AddRemoteChainE2EConfig) error {
384-
evmState, err := ccipchangeset.LoadOnchainState(env)
384+
evmState, err := stateview.LoadOnchainState(env)
385385
if err != nil {
386386
return fmt.Errorf("failed to load onchain evm state: %w", err)
387387
}
@@ -390,13 +390,13 @@ func addEVMSolanaPreconditions(env deployment.Environment, input AddRemoteChainE
390390
timelockConfig = input.MCMSConfig
391391
}
392392
// Verify evm Chain
393-
if err := ccipchangeset.ValidateChain(env, evmState, input.EVMChainSelector, timelockConfig); err != nil {
393+
if err := stateview.ValidateChain(env, evmState, input.EVMChainSelector, timelockConfig); err != nil {
394394
return fmt.Errorf("failed to validate EVM chain %d: %w", input.EVMChainSelector, err)
395395
}
396396
if _, ok := env.SolChains[input.SolanaChainSelector]; !ok {
397397
return fmt.Errorf("failed to find Solana chain in env %d", input.SolanaChainSelector)
398398
}
399-
solanaState, err := ccipchangeset.LoadOnchainStateSolana(env)
399+
solanaState, err := stateview.LoadOnchainStateSolana(env)
400400
if err != nil {
401401
return fmt.Errorf("failed to load onchain solana state: %w", err)
402402
}
@@ -407,7 +407,7 @@ func addEVMSolanaPreconditions(env deployment.Environment, input AddRemoteChainE
407407
}
408408

409409
func addEVMAndSolanaLaneLogic(env deployment.Environment, input AddRemoteChainE2EConfig) (cldf.ChangesetOutput, error) {
410-
evmState, err := ccipchangeset.LoadOnchainState(env)
410+
evmState, err := stateview.LoadOnchainState(env)
411411
if err != nil {
412412
return cldf.ChangesetOutput{}, fmt.Errorf("failed to load evm onchain state: %w", err)
413413
}

‎deployment/ccip/changeset/crossfamily/v1_6/cs_add_evm_solana_lane_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
solState "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/state"
1717
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
1818

19-
ccipchangeset "github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
2019
crossfamily "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/crossfamily/v1_6"
2120
ccipChangesetSolana "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana"
2221
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/testhelpers"
2322
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_6"
23+
"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
2424
commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
2525
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
2626
)
@@ -50,7 +50,7 @@ func TestAddEVMSolanaLaneBidirectional(t *testing.T) {
5050
require.NotEmpty(t, evmChains)
5151
solChain := solChains[0]
5252
evmChain := evmChains[0]
53-
evmState, err := ccipchangeset.LoadOnchainState(e)
53+
evmState, err := stateview.LoadOnchainState(e)
5454
require.NoError(t, err)
5555
var mcmsConfig *proposalutils.TimelockConfig
5656
if tc.mcmsEnabled {
@@ -114,10 +114,10 @@ func TestAddEVMSolanaLaneBidirectional(t *testing.T) {
114114
require.NoError(t, err)
115115

116116
// Check that the changeset was applied
117-
evmState, err = ccipchangeset.LoadOnchainState(e)
117+
evmState, err = stateview.LoadOnchainState(e)
118118
require.NoError(t, err)
119119

120-
solanaState, err := ccipchangeset.LoadOnchainStateSolana(e)
120+
solanaState, err := stateview.LoadOnchainStateSolana(e)
121121
require.NoError(t, err)
122122

123123
// evm changes

0 commit comments

Comments
 (0)