Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an interface to replace the ChangeSet function type. #16186

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Add an interface to replace the ChangeSet function type. #16186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e376678
Add an interface to replace the ChangeSet function type.
cgruber Feb 1, 2025
01d7a70
Rework ChangesetApplication to pass around an interface ConfiguredCha…
cgruber Feb 4, 2025
e358937
Pull out WrapChangeset, which existed to handle some generics which a…
cgruber Feb 4, 2025
8ee7b56
Wire in validation to the execution of changesets in the test infrast…
cgruber Feb 4, 2025
b530654
Fix a missing caller from upstream.
cgruber Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions deployment/ccip/changeset/accept_ownership_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/exp/maps"

"github.com/smartcontractkit/chainlink/deployment"
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/testhelpers"
commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
Expand Down Expand Up @@ -39,12 +40,12 @@ func Test_NewAcceptOwnershipChangeset(t *testing.T) {
require.NoError(t, err)

// compose the transfer ownership and accept ownership changesets
_, err = commonchangeset.ApplyChangesets(t, e.Env, timelockContracts, []commonchangeset.ChangesetApplication{
_, err = commonchangeset.ApplyChangesets(t, e.Env, timelockContracts, []commonchangeset.ConfiguredChangeSet{
// note this doesn't have proposals.
{
Changeset: commonchangeset.WrapChangeSet(commonchangeset.TransferToMCMSWithTimelock),
Config: testhelpers.GenTestTransferOwnershipConfig(e, allChains, state),
},
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(commonchangeset.TransferToMCMSWithTimelock),
testhelpers.GenTestTransferOwnershipConfig(e, allChains, state),
),
})
require.NoError(t, err)

Expand Down
28 changes: 14 additions & 14 deletions deployment/ccip/changeset/cs_accept_admin_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ func TestAcceptAdminRoleChangeset_Validations(t *testing.T) {

for _, test := range tests {
t.Run(test.Msg, func(t *testing.T) {
_, err := commonchangeset.ApplyChangesets(t, e, timelockContracts, []commonchangeset.ChangesetApplication{
{
Changeset: commonchangeset.WrapChangeSet(changeset.AcceptAdminRoleChangeset),
Config: test.Config,
},
_, err := commonchangeset.ApplyChangesets(t, e, timelockContracts, []commonchangeset.ConfiguredChangeSet{
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.AcceptAdminRoleChangeset),
test.Config,
),
})
require.Error(t, err)
require.ErrorContains(t, err, test.ErrStr)
Expand Down Expand Up @@ -143,10 +143,10 @@ func TestAcceptAdminRoleChangeset_Execution(t *testing.T) {
registryOnA := state.Chains[selectorA].TokenAdminRegistry
registryOnB := state.Chains[selectorB].TokenAdminRegistry

e, err = commonchangeset.ApplyChangesets(t, e, timelockContracts, []commonchangeset.ChangesetApplication{
{
Changeset: commonchangeset.WrapChangeSet(changeset.ProposeAdminRoleChangeset),
Config: changeset.TokenAdminRegistryChangesetConfig{
e, err = commonchangeset.ApplyChangesets(t, e, timelockContracts, []commonchangeset.ConfiguredChangeSet{
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.ProposeAdminRoleChangeset),
changeset.TokenAdminRegistryChangesetConfig{
MCMS: mcmsConfig,
Pools: map[uint64]map[changeset.TokenSymbol]changeset.TokenPoolInfo{
selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
Expand All @@ -163,10 +163,10 @@ func TestAcceptAdminRoleChangeset_Execution(t *testing.T) {
},
},
},
},
{
Changeset: commonchangeset.WrapChangeSet(changeset.AcceptAdminRoleChangeset),
Config: changeset.TokenAdminRegistryChangesetConfig{
),
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.AcceptAdminRoleChangeset),
changeset.TokenAdminRegistryChangesetConfig{
MCMS: mcmsConfig,
Pools: map[uint64]map[changeset.TokenSymbol]changeset.TokenPoolInfo{
selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
Expand All @@ -183,7 +183,7 @@ func TestAcceptAdminRoleChangeset_Execution(t *testing.T) {
},
},
},
},
),
})
require.NoError(t, err)

Expand Down
63 changes: 32 additions & 31 deletions deployment/ccip/changeset/cs_active_candidate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"golang.org/x/exp/maps"

"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
"github.com/smartcontractkit/chainlink/deployment"

"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/internal"
Expand Down Expand Up @@ -41,10 +42,10 @@ func Test_ActiveCandidate(t *testing.T) {

// Connect source to dest
sourceState := state.Chains[source]
tenv.Env, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ChangesetApplication{
{
Changeset: commonchangeset.WrapChangeSet(changeset.UpdateOnRampsDestsChangeset),
Config: changeset.UpdateOnRampDestsConfig{
tenv.Env, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ConfiguredChangeSet{
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.UpdateOnRampsDestsChangeset),
changeset.UpdateOnRampDestsConfig{
UpdatesByChain: map[uint64]map[uint64]changeset.OnRampDestinationUpdate{
source: {
dest: {
Expand All @@ -54,10 +55,10 @@ func Test_ActiveCandidate(t *testing.T) {
},
},
},
},
{
Changeset: commonchangeset.WrapChangeSet(changeset.UpdateFeeQuoterPricesChangeset),
Config: changeset.UpdateFeeQuoterPricesConfig{
),
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterPricesChangeset),
changeset.UpdateFeeQuoterPricesConfig{
PricesByChain: map[uint64]changeset.FeeQuoterPriceUpdatePerSource{
source: {
TokenPrices: map[common.Address]*big.Int{
Expand All @@ -70,20 +71,20 @@ func Test_ActiveCandidate(t *testing.T) {
},
},
},
},
{
Changeset: commonchangeset.WrapChangeSet(changeset.UpdateFeeQuoterDestsChangeset),
Config: changeset.UpdateFeeQuoterDestsConfig{
),
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.UpdateFeeQuoterDestsChangeset),
changeset.UpdateFeeQuoterDestsConfig{
UpdatesByChain: map[uint64]map[uint64]fee_quoter.FeeQuoterDestChainConfig{
source: {
dest: changeset.DefaultFeeQuoterDestChainConfig(true),
},
},
},
},
{
Changeset: commonchangeset.WrapChangeSet(changeset.UpdateOffRampSourcesChangeset),
Config: changeset.UpdateOffRampSourcesConfig{
),
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.UpdateOffRampSourcesChangeset),
changeset.UpdateOffRampSourcesConfig{
UpdatesByChain: map[uint64]map[uint64]changeset.OffRampSourceUpdate{
dest: {
source: {
Expand All @@ -92,10 +93,10 @@ func Test_ActiveCandidate(t *testing.T) {
},
},
},
},
{
Changeset: commonchangeset.WrapChangeSet(changeset.UpdateRouterRampsChangeset),
Config: changeset.UpdateRouterRampsConfig{
),
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.UpdateRouterRampsChangeset),
changeset.UpdateRouterRampsConfig{
UpdatesByChain: map[uint64]changeset.RouterUpdates{
// onRamp update on source chain
source: {
Expand All @@ -111,7 +112,7 @@ func Test_ActiveCandidate(t *testing.T) {
},
},
},
},
),
})
require.NoError(t, err)

Expand All @@ -124,11 +125,11 @@ func Test_ActiveCandidate(t *testing.T) {

// Transfer ownership so that we can set new candidate configs
// and set new config digest on the offramp.
_, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ChangesetApplication{
{
Changeset: commonchangeset.WrapChangeSet(commonchangeset.TransferToMCMSWithTimelock),
Config: testhelpers.GenTestTransferOwnershipConfig(tenv, allChains, state),
},
_, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ConfiguredChangeSet{
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(commonchangeset.TransferToMCMSWithTimelock),
testhelpers.GenTestTransferOwnershipConfig(tenv, allChains, state),
),
})
require.NoError(t, err)
testhelpers.AssertTimelockOwnership(t, tenv, allChains, state)
Expand Down Expand Up @@ -191,10 +192,10 @@ func Test_ActiveCandidate(t *testing.T) {
// Now we can add a candidate config, send another request, and observe behavior.
// The candidate config should not be able to execute messages.
tokenConfig := changeset.NewTestTokenConfig(state.Chains[tenv.FeedChainSel].USDFeeds)
_, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ChangesetApplication{
{
Changeset: commonchangeset.WrapChangeSet(changeset.SetCandidateChangeset),
Config: changeset.SetCandidateChangesetConfig{
_, err = commonchangeset.ApplyChangesets(t, tenv.Env, tenv.TimelockContracts(t), []commonchangeset.ConfiguredChangeSet{
commonchangeset.ChangesetApplication(
deployment.CreateLegacyChangeSet(changeset.SetCandidateChangeset),
changeset.SetCandidateChangesetConfig{
SetCandidateConfigBase: changeset.SetCandidateConfigBase{
HomeChainSelector: tenv.HomeChainSel,
FeedChainSelector: tenv.FeedChainSel,
Expand Down Expand Up @@ -226,7 +227,7 @@ func Test_ActiveCandidate(t *testing.T) {
},
},
},
},
),
})
require.NoError(t, err)

Expand Down
Loading
Loading