Skip to content

Commit 8351146

Browse files
authored
chore: move legacy analyzer into ccip pkg [CLD-1909] (#22000)
chore: move legacy analyzer into ccip pkg
1 parent af845d2 commit 8351146

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

deployment/common/proposalutils/analyze.go renamed to deployment/ccip/shared/analyze.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package proposalutils
1+
package shared
22

33
import (
44
"fmt"

deployment/common/proposalutils/analyze_test.go renamed to deployment/ccip/shared/analyze_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package proposalutils
1+
package shared
22

33
import (
44
"encoding/base64"

deployment/ccip/shared/deployergroup/deployer_group.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
2424

25+
"github.com/smartcontractkit/chainlink/deployment/ccip/shared"
2526
"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
2627
"github.com/smartcontractkit/chainlink/deployment/common/changeset/state"
2728
"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
@@ -32,8 +33,8 @@ type DeployerGroup struct {
3233
state stateview.CCIPOnChainState
3334
mcmConfig *proposalutils.TimelockConfig
3435
deploymentContext *DeploymentContext
35-
txDecoder *proposalutils.TxCallDecoder
36-
describeContext *proposalutils.ArgumentContext
36+
txDecoder *shared.TxCallDecoder
37+
describeContext *shared.ArgumentContext
3738
}
3839

3940
type DescribedTransaction interface {
@@ -121,8 +122,8 @@ type deployerGroupBuilder struct {
121122
e cldf.Environment
122123
state stateview.CCIPOnChainState
123124
mcmConfig *proposalutils.TimelockConfig
124-
txDecoder *proposalutils.TxCallDecoder
125-
describeContext *proposalutils.ArgumentContext
125+
txDecoder *shared.TxCallDecoder
126+
describeContext *shared.ArgumentContext
126127
}
127128

128129
func (d *deployerGroupBuilder) WithDeploymentContext(description string) *DeployerGroup {
@@ -154,8 +155,8 @@ func NewDeployerGroup(e cldf.Environment, state stateview.CCIPOnChainState, mcmC
154155
e: e,
155156
mcmConfig: mcmConfig,
156157
state: state,
157-
txDecoder: proposalutils.NewTxCallDecoder(nil),
158-
describeContext: proposalutils.NewArgumentContext(addresses),
158+
txDecoder: shared.NewTxCallDecoder(nil),
159+
describeContext: shared.NewArgumentContext(addresses),
159160
}
160161
// update state if timelock needs to be loaded from datastore with qualifier
161162
if d.mcmConfig != nil && d.mcmConfig.TimelockQualifierPerChain != nil {
@@ -424,7 +425,7 @@ func (d *DeployerGroup) enactMcms() (cldf.ChangesetOutput, error) {
424425
if err != nil {
425426
return cldf.ChangesetOutput{}, fmt.Errorf("failed to build proposal %w", err)
426427
}
427-
describedProposal := proposalutils.DescribeTimelockProposal(proposal, describedBatches)
428+
describedProposal := shared.DescribeTimelockProposal(proposal, describedBatches)
428429

429430
// Update the proposal metadata to incorporate the startingOpCount
430431
// from the previous proposal

0 commit comments

Comments
 (0)