CCIP-3046 fix Changeset to one word (#1336)

smartcontractkit · Aug 20, 2024 · a1bdf08 · a1bdf08
1 parent 5e33b2f
commit a1bdf08
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/integration-tests/deployment/ccip/changeset/1_cap_reg.go b/integration-tests/deployment/ccip/changeset/1_cap_reg.go
@@ -6,14 +6,14 @@ import (
 )
 
 // Separate migration because cap reg is an env var for CL nodes.
-func Apply0001(env deployment.Environment, homeChainSel uint64) (deployment.ChangeSetOutput, error) {
+func Apply0001(env deployment.Environment, homeChainSel uint64) (deployment.ChangesetOutput, error) {
 	// Note we also deploy the cap reg.
 	ab, _, err := ccipdeployment.DeployCapReg(env.Logger, env.Chains, homeChainSel)
 	if err != nil {
 		env.Logger.Errorw("Failed to deploy cap reg", "err", err, "addresses", ab)
-		return deployment.ChangeSetOutput{}, err
+		return deployment.ChangesetOutput{}, err
 	}
-	return deployment.ChangeSetOutput{
+	return deployment.ChangesetOutput{
 		Proposals:   []deployment.Proposal{},
 		AddressBook: ab,
 		JobSpecs:    nil,

diff --git a/integration-tests/deployment/ccip/changeset/2_initial_deploy.go b/integration-tests/deployment/ccip/changeset/2_initial_deploy.go
@@ -10,21 +10,21 @@ import (
 // TODO: Maybe there's a generics approach here?
 // Note if the change set is a deployment and it fails we have 2 options:
 // - Just throw away the addresses, fix issue and try again (potentially expensive on mainnet)
-func Apply0002(env deployment.Environment, c ccipdeployment.DeployCCIPContractConfig) (deployment.ChangeSetOutput, error) {
+func Apply0002(env deployment.Environment, c ccipdeployment.DeployCCIPContractConfig) (deployment.ChangesetOutput, error) {
 	ab, err := ccipdeployment.DeployCCIPContracts(env, c)
 	if err != nil {
 		env.Logger.Errorw("Failed to deploy CCIP contracts", "err", err, "addresses", ab)
-		return deployment.ChangeSetOutput{}, err
+		return deployment.ChangesetOutput{}, err
 	}
 	js, err := ccipdeployment.NewCCIPJobSpecs(env.NodeIDs, env.Offchain)
 	if err != nil {
-		return deployment.ChangeSetOutput{}, err
+		return deployment.ChangesetOutput{}, err
 	}
 	proposal, err := ccipdeployment.GenerateAcceptOwnershipProposal(env, env.AllChainSelectors(), ab)
 	if err != nil {
-		return deployment.ChangeSetOutput{}, err
+		return deployment.ChangesetOutput{}, err
 	}
-	return deployment.ChangeSetOutput{
+	return deployment.ChangesetOutput{
 		Proposals:   []deployment.Proposal{proposal},
 		AddressBook: ab,
 		// Mapping of which nodes get which jobs.

diff --git a/integration-tests/deployment/change_set.go → integration-tests/deployment/changeset.go b/integration-tests/deployment/change_set.go → integration-tests/deployment/changeset.go
@@ -21,7 +21,7 @@ func (p Proposal) String() string {
 }
 
 // Services as input to CI/Async tasks
-type ChangeSetOutput struct {
+type ChangesetOutput struct {
 	JobSpecs    map[string][]string
 	Proposals   []Proposal
 	AddressBook AddressBook