storageminer: Cleanup CLI

cli/cmd.go

@@ -209,6 +209,14 @@ func ReqContext(cctx *cli.Context) context.Context {
 	return ctx
 }
 
+var CommonCommands = []*cli.Command{
+	authCmd,
+	fetchParamCmd,
+	netCmd,
+	versionCmd,
+	logCmd,
+}
+
 var Commands = []*cli.Command{
 	authCmd,
 	chainCmd,

cmd/lotus-storage-miner/main.go

@@ -25,7 +25,6 @@ func main() {
 		dealsCmd,
 		infoCmd,
 		initCmd,
-		pledgeSectorCmd,
 		rewardsCmd,
 		runCmd,
 		sectorsCmd,
@@ -71,7 +70,7 @@ func main() {
 			},
 		},
 
-		Commands: append(local, lcli.Commands...),
+		Commands: append(local, lcli.CommonCommands...),
 	}
 	app.Setup()
 	app.Metadata["repoType"] = repo.StorageMiner

cmd/lotus-storage-miner/sectors.go

@@ -18,8 +18,20 @@ import (
 	lcli "github.com/filecoin-project/lotus/cli"
 )
 
-var pledgeSectorCmd = &cli.Command{
-	Name:  "pledge-sector",
+var sectorsCmd = &cli.Command{
+	Name:  "sectors",
+	Usage: "interact with sector store",
+	Subcommands: []*cli.Command{
+		sectorsStatusCmd,
+		sectorsListCmd,
+		sectorsRefsCmd,
+		sectorsUpdateCmd,
+		sectorsPledgeCmd,
+	},
+}
+
+var sectorsPledgeCmd = &cli.Command{
+	Name:  "pledge",
 	Usage: "store random data in a sector",
 	Action: func(cctx *cli.Context) error {
 		nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
@@ -33,17 +45,6 @@ var pledgeSectorCmd = &cli.Command{
 	},
 }
 
-var sectorsCmd = &cli.Command{
-	Name:  "sectors",
-	Usage: "interact with sector store",
-	Subcommands: []*cli.Command{
-		sectorsStatusCmd,
-		sectorsListCmd,
-		sectorsRefsCmd,
-		sectorsUpdateCmd,
-	},
-}
-
 var sectorsStatusCmd = &cli.Command{
 	Name:  "status",
 	Usage: "Get the seal status of a sector by its ID",

cmd/lotus-storage-miner/workers.go

@@ -0,0 +1 @@
+package main