fix: use helper functions

Author: minhd-vu

cmd/p2p/nodelist/nodelist.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"os"
 
+	"github.com/0xPolygon/polygon-cli/flag"
 	"github.com/0xPolygon/polygon-cli/p2p/database"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -61,7 +61,5 @@ func init() {
 	f.IntVarP(&inputNodeListParams.Limit, "limit", "l", 100, "number of unique nodes to return")
 	f.StringVarP(&inputNodeListParams.ProjectID, "project-id", "p", "", "GCP project ID")
 	f.StringVarP(&inputNodeListParams.DatabaseID, "database-id", "d", "", "datastore database ID")
-	if err := NodeListCmd.MarkFlagRequired("project-id"); err != nil {
-		log.Error().Err(err).Msg("Failed to mark project-id as required flag")
-	}
+	flag.MarkFlagRequired(NodeListCmd, "project-id")
 }

cmd/p2p/query/query.go

@@ -6,9 +6,9 @@ import (
 	"net"
 
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
+	"github.com/0xPolygon/polygon-cli/flag"
 	"github.com/0xPolygon/polygon-cli/p2p"
 )
 
@@ -132,7 +132,5 @@ func init() {
 	f.StringVarP(&inputQueryParams.KeyFile, "key-file", "k", "", "private key file (cannot be set with --key)")
 	f.StringVar(&inputQueryParams.PrivateKey, "key", "", "hex-encoded private key (cannot be set with --key-file)")
 	QueryCmd.MarkFlagsMutuallyExclusive("key-file", "key")
-	if err := QueryCmd.MarkFlagRequired("start-block"); err != nil {
-		log.Error().Err(err).Msg("Failed to mark start-block as required flag")
-	}
+	flag.MarkFlagRequired(QueryCmd, "start-block")
 }

cmd/p2p/sensor/sensor.go

@@ -28,6 +28,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
+	"github.com/0xPolygon/polygon-cli/flag"
 	"github.com/0xPolygon/polygon-cli/p2p"
 	"github.com/0xPolygon/polygon-cli/p2p/database"
 	"github.com/0xPolygon/polygon-cli/rpctypes"
@@ -419,15 +420,11 @@ func init() {
 	f := SensorCmd.Flags()
 	f.StringVarP(&inputSensorParams.Bootnodes, "bootnodes", "b", "", "comma separated nodes used for bootstrapping")
 	f.Uint64VarP(&inputSensorParams.NetworkID, "network-id", "n", 0, "filter discovered nodes by this network ID")
-	if err := SensorCmd.MarkFlagRequired("network-id"); err != nil {
-		log.Error().Err(err).Msg("Failed to mark network-id as required persistent flag")
-	}
+	flag.MarkFlagRequired(SensorCmd, "network-id")
 	f.StringVarP(&inputSensorParams.ProjectID, "project-id", "p", "", "GCP project ID")
 	f.StringVarP(&inputSensorParams.DatabaseID, "database-id", "d", "", "datastore database ID")
 	f.StringVarP(&inputSensorParams.SensorID, "sensor-id", "s", "", "sensor ID when writing block/tx events")
-	if err := SensorCmd.MarkFlagRequired("sensor-id"); err != nil {
-		log.Error().Err(err).Msg("Failed to mark sensor-id as required persistent flag")
-	}
+	flag.MarkFlagRequired(SensorCmd, "sensor-id")
 	f.IntVarP(&inputSensorParams.MaxPeers, "max-peers", "m", 2000, "maximum number of peers to connect to")
 	f.IntVarP(&inputSensorParams.MaxDatabaseConcurrency, "max-db-concurrency", "D", 10000,
 		`maximum number of concurrent database operations to perform (increasing this

cmd/ulxly/ulxly.go

@@ -2307,9 +2307,9 @@ func (o *GetEvent) AddFlags(cmd *cobra.Command) {
 	f.Uint64VarP(&o.ToBlock, ArgToBlock, "t", 0, "end of the range of blocks to retrieve")
 	f.Uint64VarP(&o.FilterSize, ArgFilterSize, "i", 1000, "batch size for individual filter queries")
 	f.BoolVarP(&o.Insecure, ArgInsecure, "", false, "skip TLS certificate verification")
-	fatalIfError(cmd.MarkFlagRequired(ArgFromBlock))
-	fatalIfError(cmd.MarkFlagRequired(ArgToBlock))
-	fatalIfError(cmd.MarkFlagRequired(ArgRPCURL))
+	flag.MarkFlagRequired(cmd, ArgFromBlock)
+	flag.MarkFlagRequired(cmd, ArgToBlock)
+	flag.MarkFlagRequired(cmd, ArgRPCURL)
 }
 
 type GetSmcOptions struct {
@@ -2547,7 +2547,7 @@ or if it's actually an intermediate hash.`,
 	fBridgeAndClaim.StringVar(&inputUlxlyArgs.gasPrice, ArgGasPrice, "", "gas price to use")
 	fBridgeAndClaim.BoolVar(&inputUlxlyArgs.dryRun, ArgDryRun, false, "do all of the transaction steps but do not send the transaction")
 	fBridgeAndClaim.BoolVar(&inputUlxlyArgs.insecure, ArgInsecure, false, "skip TLS certificate verification")
-	fatalIfError(ulxlyBridgeAndClaimCmd.MarkPersistentFlagRequired(ArgBridgeAddress))
+	flag.MarkPersistentFlagRequired(ulxlyBridgeAndClaimCmd, ArgBridgeAddress)
 
 	// bridge specific args
 	fBridge := ulxlyBridgeCmd.PersistentFlags()
@@ -2557,7 +2557,7 @@ or if it's actually an intermediate hash.`,
 	fBridge.StringVar(&inputUlxlyArgs.tokenAddress, ArgTokenAddress, "0x0000000000000000000000000000000000000000", "address of ERC20 token to use")
 	fBridge.StringVar(&inputUlxlyArgs.callData, ArgCallData, "0x", "call data to be passed directly with bridge-message or as an ERC20 Permit")
 	fBridge.StringVar(&inputUlxlyArgs.callDataFile, ArgCallDataFile, "", "a file containing hex encoded call data")
-	fatalIfError(ulxlyBridgeCmd.MarkPersistentFlagRequired(ArgDestNetwork))
+	flag.MarkPersistentFlagRequired(ulxlyBridgeCmd, ArgDestNetwork)
 
 	// Claim specific args
 	fClaim := ulxlyClaimCmd.PersistentFlags()
@@ -2566,9 +2566,9 @@ or if it's actually an intermediate hash.`,
 	fClaim.StringVar(&inputUlxlyArgs.bridgeServiceURL, ArgBridgeServiceURL, "", "URL of the bridge service")
 	fClaim.StringVar(&inputUlxlyArgs.globalIndex, ArgGlobalIndex, "", "an override of the global index value")
 	fClaim.DurationVar(&inputUlxlyArgs.wait, ArgWait, time.Duration(0), "retry claiming until deposit is ready, up to specified duration (available for claim asset and claim message)")
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositCount))
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositNetwork))
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgBridgeServiceURL))
+	flag.MarkPersistentFlagRequired(ulxlyClaimCmd, ArgDepositCount)
+	flag.MarkPersistentFlagRequired(ulxlyClaimCmd, ArgDepositNetwork)
+	flag.MarkPersistentFlagRequired(ulxlyClaimCmd, ArgBridgeServiceURL)
 
 	// Claim Everything Helper Command
 	fClaimEverything := claimEverythingCommand.Flags()
@@ -2577,7 +2577,7 @@ or if it's actually an intermediate hash.`,
 	fClaimEverything.IntVar(&inputUlxlyArgs.bridgeOffset, ArgBridgeOffset, 0, "offset to specify for pagination of underlying bridge service deposits")
 	fClaimEverything.UintVar(&inputUlxlyArgs.concurrency, ArgConcurrency, 1, "worker pool size for claims")
 
-	fatalIfError(claimEverythingCommand.MarkFlagRequired(ArgBridgeMappings))
+	flag.MarkFlagRequired(claimEverythingCommand, ArgBridgeMappings)
 
 	// Top Level
 	ULxLyCmd.AddCommand(ulxlyBridgeAndClaimCmd)