Skip to content

Commit

Permalink
Merge pull request #5900 from filecoin-project/mg/chore/move-mpool-clear
Browse files Browse the repository at this point in the history
chore: Move lotus mpool clear to lotus-shed
  • Loading branch information
magik6k authored Apr 5, 2021
2 parents f67bc0b + c800211 commit 49f8b8d
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
7 changes: 5 additions & 2 deletions cli/mpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,11 @@ var MpoolPending = &cli.Command{
},
}

// Deprecated: MpoolClear is now available at `lotus-shed mpool clear`
var MpoolClear = &cli.Command{
Name: "clear",
Usage: "Clear all pending messages from the mpool (USE WITH CARE)",
Name: "clear",
Usage: "Clear all pending messages from the mpool (USE WITH CARE) (DEPRECATED)",
Hidden: true,
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "local",
Expand All @@ -146,6 +148,7 @@ var MpoolClear = &cli.Command{
},
},
Action: func(cctx *cli.Context) error {
fmt.Println("DEPRECATED: This behavior is being moved to `lotus-shed mpool clear`")
api, closer, err := GetFullNodeAPI(cctx)
if err != nil {
return err
Expand Down
34 changes: 34 additions & 0 deletions cmd/lotus-shed/mpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var mpoolCmd = &cli.Command{
Flags: []cli.Flag{},
Subcommands: []*cli.Command{
minerSelectMsgsCmd,
mpoolClear,
},
}

Expand Down Expand Up @@ -66,3 +67,36 @@ var minerSelectMsgsCmd = &cli.Command{
return nil
},
}

var mpoolClear = &cli.Command{
Name: "clear",
Usage: "Clear all pending messages from the mpool (USE WITH CARE)",
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "local",
Usage: "also clear local messages",
},
&cli.BoolFlag{
Name: "really-do-it",
Usage: "must be specified for the action to take effect",
},
},
Action: func(cctx *cli.Context) error {
api, closer, err := lcli.GetFullNodeAPI(cctx)
if err != nil {
return err
}
defer closer()

really := cctx.Bool("really-do-it")
if !really {
//nolint:golint
return fmt.Errorf("--really-do-it must be specified for this action to have an effect; you have been warned")
}

local := cctx.Bool("local")

ctx := lcli.ReqContext(cctx)
return api.MpoolClear(ctx, local)
},
}

0 comments on commit 49f8b8d

Please sign in to comment.