Skip to content

Commit 7ff9767

Browse files
fix(mcms): make proposalContextProvider a required param of BuildMCMSv2Cmd
1 parent 3a17c98 commit 7ff9767

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

engine/cld/legacy/cli/mcmsv2/mcms_v2.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ func BuildMCMSv2Cmd(lggr logger.Logger, domain cldf_domain.Domain, proposalConte
8787
validProposalKinds = []string{string(types.KindProposal), string(types.KindTimelockProposal)}
8888
)
8989

90+
if lggr == nil {
91+
panic("nil logger received")
92+
}
93+
if proposalContextProvider == nil {
94+
panic("nil proposal context provider received")
95+
}
96+
9097
cmd := cobra.Command{
9198
Use: "mcmsv2",
9299
Short: "Manage MCMS proposals",
@@ -1097,20 +1104,16 @@ func newCfgv2(lggr logger.Logger, cmd *cobra.Command, domain cldf_domain.Domain,
10971104
}
10981105
}
10991106

1100-
if proposalCtxProvider != nil {
1101-
// Load Environment and proposal ctx (for error decoding and proposal analysis)
1102-
env, err := cldfenvironment.Load(cmd.Context(), domain, cfg.envStr,
1103-
cldfenvironment.WithLogger(lggr),
1104-
cldfenvironment.OnlyLoadChainsFor(chainSelectors), cldfenvironment.WithoutJD())
1105-
if err != nil {
1106-
return nil, fmt.Errorf("error loading environment: %w", err)
1107-
}
1108-
cfg.env = env
1109-
proposalCtx, err := proposalCtxProvider(env)
1110-
if err != nil {
1111-
return nil, fmt.Errorf("failed to provide proposal analysis context: %w", err)
1112-
}
1113-
cfg.proposalCtx = proposalCtx
1107+
// Load Environment and proposal ctx (for error decoding and proposal analysis)
1108+
cfg.env, err = cldfenvironment.Load(cmd.Context(), domain, cfg.envStr,
1109+
cldfenvironment.WithLogger(lggr),
1110+
cldfenvironment.OnlyLoadChainsFor(chainSelectors), cldfenvironment.WithoutJD())
1111+
if err != nil {
1112+
return nil, fmt.Errorf("error loading environment: %w", err)
1113+
}
1114+
cfg.proposalCtx, err = proposalCtxProvider(cfg.env)
1115+
if err != nil {
1116+
return nil, fmt.Errorf("failed to provide proposal analysis context: %w", err)
11141117
}
11151118

11161119
if flags.fork {

0 commit comments

Comments
 (0)