Merge pull request #7042 from filecoin-project/fix/lotus-miner-net-markets

cli/cmd.go

@@ -58,7 +58,6 @@ var GetMarketsAPI = cliutil.GetMarketsAPI
 var GetWorkerAPI = cliutil.GetWorkerAPI
 
 var CommonCommands = []*cli.Command{
-	NetCmd,
 	AuthCmd,
 	LogCmd,
 	WaitApiCmd,

cmd/lotus-miner/main.go

@@ -5,16 +5,17 @@ import (
 	"fmt"
 
 	"github.com/fatih/color"
-	cliutil "github.com/filecoin-project/lotus/cli/util"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/urfave/cli/v2"
 	"go.opencensus.io/trace"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
+
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
 	lcli "github.com/filecoin-project/lotus/cli"
+	cliutil "github.com/filecoin-project/lotus/cli/util"
 	"github.com/filecoin-project/lotus/lib/lotuslog"
 	"github.com/filecoin-project/lotus/lib/tracing"
 	"github.com/filecoin-project/lotus/node/repo"
@@ -78,6 +79,20 @@ func main() {
 		}
 	}
 
+	// adapt the Net* commands to always hit the node running the markets
+	// subsystem, as that is the only one that runs a libp2p node.
+	netCmd := *lcli.NetCmd // make a copy.
+	prev := netCmd.Before
+	netCmd.Before = func(c *cli.Context) error {
+		if prev != nil {
+			if err := prev(c); err != nil {
+				return err
+			}
+		}
+		c.App.Metadata["repoType"] = repo.Markets
+		return nil
+	}
+
 	app := &cli.App{
 		Name:                 "lotus-miner",
 		Usage:                "Filecoin decentralized storage network miner",
@@ -120,7 +135,7 @@ func main() {
 			},
 			cliutil.FlagVeryVerbose,
 		},
-		Commands: append(local, lcli.CommonCommands...),
+		Commands: append(local, append(lcli.CommonCommands, &netCmd)...),
 		Before: func(c *cli.Context) error {
 			// this command is explicitly called on markets, inform
 			// common commands by overriding the repoType.