refactor: refactoring Narg checks

cli/chain.go

@@ -399,6 +399,10 @@ var ChainSetHeadCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		if !cctx.Bool("genesis") && !cctx.IsSet("epoch") && cctx.NArg() != 1 {
 			return IncorrectNumArgs(cctx)
 		}
@@ -1299,6 +1303,10 @@ var SlashConsensusFault = &cli.Command{
 		a := srv.FullNodeAPI()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 2 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		c1, err := cid.Parse(cctx.Args().Get(0))
 		if err != nil {
 			return xerrors.Errorf("parsing cid 1: %w", err)

cli/disputer.go

@@ -63,6 +63,10 @@ var disputerMsgCmd = &cli.Command{
 
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 3 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		api, closer, err := GetFullNodeAPI(cctx)
 		if err != nil {
 			return err
@@ -150,6 +154,10 @@ var disputerStartCmd = &cli.Command{
 
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		fromAddr, err := getSender(ctx, api, cctx.String("from"))
 		if err != nil {
 			return err

cli/evm.go

@@ -217,8 +217,8 @@ var EvmDeployCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
-		if argc := cctx.Args().Len(); argc != 1 {
-			return xerrors.Errorf("must pass the contract init code")
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
 		}
 
 		contract, err := os.ReadFile(cctx.Args().First())
@@ -338,8 +338,8 @@ var EvmInvokeCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
-		if argc := cctx.Args().Len(); argc != 2 {
-			return xerrors.Errorf("must pass the address and calldata")
+		if cctx.NArg() != 2 {
+			return IncorrectNumArgs(cctx)
 		}
 
 		addr, err := address.NewFromString(cctx.Args().Get(0))

cli/f3.go

@@ -316,8 +316,8 @@ var f3SubCmdCerts = &cli.Command{
 				f3FlagOutput,
 			},
 			Before: func(cctx *cli.Context) error {
-				if count := cctx.NArg(); count > 1 {
-					return fmt.Errorf("too many arguments: expected at most 1 but got %d", count)
+				if cctx.NArg() != 1 {
+					return IncorrectNumArgs(cctx)
 				}
 				return nil
 			},
@@ -397,8 +397,8 @@ Examples:
 				f3FlagReverseOrder,
 			},
 			Before: func(cctx *cli.Context) error {
-				if count := cctx.NArg(); count > 1 {
-					return fmt.Errorf("too many arguments: expected at most 1 but got %d", count)
+				if cctx.NArg() > 1 {
+					return IncorrectNumArgs(cctx)
 				}
 				return nil
 			},

cli/filplus.go

@@ -256,7 +256,7 @@ var filplusListAllocationsCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() > 1 {
+		if cctx.NArg() != 1 {
 			return IncorrectNumArgs(cctx)
 		}
 
@@ -401,7 +401,7 @@ var filplusListClaimsCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() > 1 {
+		if cctx.NArg() != 1 {
 			return IncorrectNumArgs(cctx)
 		}
 

cli/log.go

@@ -81,6 +81,10 @@ var LogSetLevel = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		if !cctx.Args().Present() {
 			return fmt.Errorf("level is required")
 		}

cli/multisig.go

@@ -214,6 +214,10 @@ var msigInspectCmd = &cli.Command{
 
 		store := adt.WrapStore(ctx, cbor.NewCborStore(blockstore.NewAPIBlockstore(api)))
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		maddr, err := address.NewFromString(cctx.Args().First())
 		if err != nil {
 			return err
@@ -399,7 +403,7 @@ var msigProposeCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 3 {
+		if cctx.NArg() != 3 {
 			return ShowHelp(cctx, fmt.Errorf("must pass at least multisig address, destination, and value"))
 		}
 
@@ -521,7 +525,7 @@ var msigApproveCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 2 {
+		if cctx.NArg() != 2 {
 			return ShowHelp(cctx, fmt.Errorf("must pass at least multisig address and message ID"))
 		}
 
@@ -658,7 +662,7 @@ var msigCancelCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 2 {
+		if cctx.NArg() != 2 {
 			return ShowHelp(cctx, fmt.Errorf("must pass at least multisig address and message ID"))
 		}
 

cli/net.go

@@ -275,6 +275,10 @@ var NetDisconnect = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		ids := cctx.Args().Slice()
 		for _, id := range ids {
 			pid, err := peer.Decode(id)
@@ -416,6 +420,10 @@ var NetFindPeer = &cli.Command{
 
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		addrs, err := api.NetFindPeer(ctx, pid)
 
 		if err != nil {
@@ -592,6 +600,10 @@ var NetBlockAddPeer = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		var peers []peer.ID
 		for _, s := range cctx.Args().Slice() {
 			p, err := peer.Decode(s)
@@ -618,6 +630,10 @@ var NetBlockAddIP = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		return api.NetBlockAdd(ctx, atypes.NetBlockList{IPAddrs: cctx.Args().Slice()})
 	},
 }
@@ -634,6 +650,10 @@ var NetBlockAddSubnet = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		return api.NetBlockAdd(ctx, atypes.NetBlockList{IPSubnets: cctx.Args().Slice()})
 	},
 }
@@ -660,6 +680,10 @@ var NetBlockRemovePeer = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		var peers []peer.ID
 		for _, s := range cctx.Args().Slice() {
 			p, err := peer.Decode(s)
@@ -686,6 +710,10 @@ var NetBlockRemoveIP = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		return api.NetBlockRemove(ctx, atypes.NetBlockList{IPAddrs: cctx.Args().Slice()})
 	},
 }
@@ -702,6 +730,10 @@ var NetBlockRemoveSubnet = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		return api.NetBlockRemove(ctx, atypes.NetBlockList{IPSubnets: cctx.Args().Slice()})
 	},
 }
@@ -958,6 +990,10 @@ var NetProtectAdd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		pids, err := decodePeerIDsFromArgs(cctx)
 		if err != nil {
 			return err
@@ -988,6 +1024,10 @@ var NetProtectRemove = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() < 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		pids, err := decodePeerIDsFromArgs(cctx)
 		if err != nil {
 			return err

cli/spcli/actor.go

@@ -265,6 +265,10 @@ func ActorSetAddrsCmd(getActor ActorAddressGetter) *cli.Command {
 
 			ctx := lcli.ReqContext(cctx)
 
+			if cctx.NArg() != 1 {
+				return lcli.IncorrectNumArgs(cctx)
+			}
+
 			var addrs []abi.Multiaddrs
 			for _, a := range args {
 				maddr, err := ma.NewMultiaddr(a)
@@ -746,6 +750,10 @@ func ActorProposeChangeWorkerCmd(getActor ActorAddressGetter) *cli.Command {
 
 			ctx := lcli.ReqContext(cctx)
 
+			if cctx.NArg() != 1 {
+				return lcli.IncorrectNumArgs(cctx)
+			}
+
 			na, err := address.NewFromString(cctx.Args().First())
 			if err != nil {
 				return err
@@ -992,6 +1000,10 @@ func ActorConfirmChangeWorkerCmd(getActor ActorAddressGetter) *cli.Command {
 
 			ctx := lcli.ReqContext(cctx)
 
+			if cctx.NArg() != 1 {
+				return lcli.IncorrectNumArgs(cctx)
+			}
+
 			na, err := address.NewFromString(cctx.Args().First())
 			if err != nil {
 				return err

cli/spcli/sectors.go

@@ -1336,7 +1336,7 @@ func TerminateSectorCmd(getActorAddress ActorAddressGetter) *cli.Command {
 			},
 		},
 		Action: func(cctx *cli.Context) error {
-			if cctx.NArg() < 1 {
+			if cctx.NArg() != 1 {
 				return lcli.ShowHelp(cctx, fmt.Errorf("at least one sector must be specified"))
 			}
 

cli/sync.go

@@ -118,6 +118,10 @@ var SyncMarkBadCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		if !cctx.Args().Present() {
 			return fmt.Errorf("must specify block cid to mark")
 		}
@@ -149,6 +153,10 @@ var SyncUnmarkBadCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		if cctx.Bool("all") {
 			return napi.SyncUnmarkAllBad(ctx)
 		}
@@ -180,6 +188,10 @@ var SyncCheckBadCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		if !cctx.Args().Present() {
 			return fmt.Errorf("must specify block cid to check")
 		}
@@ -222,6 +234,10 @@ var SyncCheckpointCmd = &cli.Command{
 		defer closer()
 		ctx := ReqContext(cctx)
 
+		if cctx.NArg() != 1 {
+			return IncorrectNumArgs(cctx)
+		}
+
 		var ts *types.TipSet
 
 		if cctx.IsSet("epoch") {

cli/wallet.go

@@ -733,7 +733,7 @@ var walletMarketAdd = &cli.Command{
 		afmt := NewAppFmt(cctx.App)
 
 		// Get amount param
-		if cctx.NArg() < 1 {
+		if cctx.NArg() != 1 {
 			return IncorrectNumArgs(cctx)
 		}
 		f, err := types.ParseFIL(cctx.Args().First())

cmd/lotus-miner/proving.go

@@ -304,7 +304,7 @@ var provingRecoverFaultsCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 1 {
+		if cctx.NArg() != 1 {
 			return lcli.ShowHelp(cctx, xerrors.Errorf("must pass at least 1 sector number"))
 		}
 

cmd/lotus-miner/sealing.go

@@ -410,7 +410,7 @@ var sealingDataCidCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 1 || cctx.NArg() > 2 {
+		if cctx.NArg() != 1 || cctx.NArg() > 2 {
 			return lcli.ShowHelp(cctx, xerrors.Errorf("expected 1 or 2 arguments"))
 		}
 

cmd/lotus-shed/sectors.go

@@ -88,7 +88,7 @@ var terminateSectorPenaltyEstimationCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if cctx.NArg() < 1 {
+		if cctx.NArg() != 1 {
 			return lcli.ShowHelp(cctx, fmt.Errorf("at least one sector must be specified"))
 		}