chore: use PreRunE in cmd definitions

Author: leovct

cmd/ulxly/ulxly.go

@@ -1174,18 +1174,48 @@ var ULxLyCmd = &cobra.Command{
 var ulxlyBridgeAndClaimCmd = &cobra.Command{
 	Args:   cobra.NoArgs,
 	Hidden: true,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if err := cmd.MarkPersistentFlagRequired(ArgPrivateKey); err != nil {
+			return err
+		}
+		if err := cmd.MarkPersistentFlagRequired(ArgRPCURL); err != nil {
+			return err
+		}
+		if err := cmd.MarkPersistentFlagRequired(ArgBridgeAddress); err != nil {
+			return err
+		}
+		return nil
+	},
 }
 
 var ulxlyBridgeCmd = &cobra.Command{
 	Use:   "bridge",
 	Short: "Commands for moving funds and sending messages from one chain to another",
 	Args:  cobra.NoArgs,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if err := cmd.MarkPersistentFlagRequired(ArgDestNetwork); err != nil {
+			return err
+		}
+		return nil
+	},
 }
 
 var ulxlyClaimCmd = &cobra.Command{
 	Use:   "claim",
 	Short: "Commands for claiming deposits on a particular chain",
 	Args:  cobra.NoArgs,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if err := cmd.MarkPersistentFlagRequired(ArgDepositCount); err != nil {
+			return err
+		}
+		if err := cmd.MarkPersistentFlagRequired(ArgDepositNetwork); err != nil {
+			return err
+		}
+		if err := cmd.MarkPersistentFlagRequired(ArgBridgeServiceURL); err != nil {
+			return err
+		}
+		return nil
+	},
 }
 
 var bridgeAssetCmd = &cobra.Command{
@@ -1238,9 +1268,14 @@ var claimMessageCmd = &cobra.Command{
 	},
 }
 var claimEverythingCmd = &cobra.Command{
-	Use:     "claim-everything",
-	Short:   "Attempt to claim as many deposits and messages as possible",
-	PreRunE: prepInputs,
+	Use:   "claim-everything",
+	Short: "Attempt to claim as many deposits and messages as possible",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if err := cmd.MarkFlagRequired(ArgBridgeMappings); err != nil {
+			return err
+		}
+		return prepInputs(cmd, args)
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return claimEverything(cmd)
 	},
@@ -1282,6 +1317,18 @@ var getDepositCmd = &cobra.Command{
 	Use:   "get-deposits",
 	Short: "Generate ndjson for each bridge deposit over a particular range of blocks",
 	Long:  depositGetUsage,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if err := cmd.MarkFlagRequired(ArgFromBlock); err != nil {
+			return err
+		}
+		if err := cmd.MarkFlagRequired(ArgToBlock); err != nil {
+			return err
+		}
+		if err := cmd.MarkFlagRequired(ArgRPCURL); err != nil {
+			return err
+		}
+		return nil
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return readDeposit(cmd)
 	},
@@ -1387,13 +1434,6 @@ func prepInputs(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func fatalIfError(err error) {
-	if err == nil {
-		return
-	}
-	log.Fatal().Err(err).Msg("Unexpected error occurred")
-}
-
 func init() {
 	// Arguments for both bridge and claim
 	inputUlxlyArgs.rpcURL = ulxlyBridgeAndClaimCmd.PersistentFlags().String(ArgRPCURL, "", "the URL of the RPC to send the transaction")
@@ -1405,9 +1445,6 @@ func init() {
 	inputUlxlyArgs.timeout = ulxlyBridgeAndClaimCmd.PersistentFlags().Uint64(ArgTimeout, 60, "the amount of time to wait while trying to confirm a transaction receipt")
 	inputUlxlyArgs.gasPrice = ulxlyBridgeAndClaimCmd.PersistentFlags().String(ArgGasPrice, "", "the gas price to be used")
 	inputUlxlyArgs.dryRun = ulxlyBridgeAndClaimCmd.PersistentFlags().Bool(ArgDryRun, false, "do all of the transaction steps but do not send the transaction")
-	fatalIfError(ulxlyBridgeAndClaimCmd.MarkPersistentFlagRequired(ArgPrivateKey))
-	fatalIfError(ulxlyBridgeAndClaimCmd.MarkPersistentFlagRequired(ArgRPCURL))
-	fatalIfError(ulxlyBridgeAndClaimCmd.MarkPersistentFlagRequired(ArgBridgeAddress))
 
 	// bridge specific args
 	inputUlxlyArgs.forceUpdate = ulxlyBridgeCmd.PersistentFlags().Bool(ArgForceUpdate, true, "indicates if the new global exit root is updated or not")
@@ -1416,32 +1453,24 @@ func init() {
 	inputUlxlyArgs.tokenAddress = ulxlyBridgeCmd.PersistentFlags().String(ArgTokenAddress, "0x0000000000000000000000000000000000000000", "the address of an ERC20 token to be used")
 	inputUlxlyArgs.callData = ulxlyBridgeCmd.PersistentFlags().String(ArgCallData, "0x", "call data to be passed directly with bridge-message or as an ERC20 Permit")
 	inputUlxlyArgs.callDataFile = ulxlyBridgeCmd.PersistentFlags().String(ArgCallDataFile, "", "a file containing hex encoded call data")
-	fatalIfError(ulxlyBridgeCmd.MarkPersistentFlagRequired(ArgDestNetwork))
 
 	// Claim specific args
 	inputUlxlyArgs.depositCount = ulxlyClaimCmd.PersistentFlags().Uint64(ArgDepositCount, 0, "the deposit count of the bridge transaction")
 	inputUlxlyArgs.depositNetwork = ulxlyClaimCmd.PersistentFlags().Uint64(ArgDepositNetwork, 0, "the rollup id of the network where the deposit was initially made")
 	inputUlxlyArgs.bridgeServiceURL = ulxlyClaimCmd.PersistentFlags().String(ArgBridgeServiceURL, "", "the URL of the bridge service")
 	inputUlxlyArgs.globalIndex = ulxlyClaimCmd.PersistentFlags().String(ArgGlobalIndex, "", "an override of the global index value")
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositCount))
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgDepositNetwork))
-	fatalIfError(ulxlyClaimCmd.MarkPersistentFlagRequired(ArgBridgeServiceURL))
 
 	// Claim Everything Helper Command
 	inputUlxlyArgs.bridgeServiceURLs = claimEverythingCmd.Flags().StringSlice(ArgBridgeMappings, nil, "Mappings between network ids and bridge service urls. E.g. '1=http://network-1-bridgeurl,7=http://network-2-bridgeurl'")
 	inputUlxlyArgs.bridgeLimit = claimEverythingCmd.Flags().Int(ArgBridgeLimit, 25, "Limit the number or responses returned by the bridge service when claiming")
 	inputUlxlyArgs.bridgeOffset = claimEverythingCmd.Flags().Int(ArgBridgeOffset, 0, "The offset to specify for pagination of the underlying bridge service deposits")
-	fatalIfError(claimEverythingCmd.MarkFlagRequired(ArgBridgeMappings))
 
 	// Args that are just for the get deposit command
 	inputUlxlyArgs.fromBlock = getDepositCmd.Flags().Uint64(ArgFromBlock, 0, "The start of the range of blocks to retrieve")
 	inputUlxlyArgs.toBlock = getDepositCmd.Flags().Uint64(ArgToBlock, 0, "The end of the range of blocks to retrieve")
 	inputUlxlyArgs.filterSize = getDepositCmd.Flags().Uint64(ArgFilterSize, 1000, "The batch size for individual filter queries")
 	getDepositCmd.Flags().String(ArgRPCURL, "", "The RPC URL to read deposit data")
 	getDepositCmd.Flags().String(ArgBridgeAddress, "", "The address of the ulxly bridge")
-	fatalIfError(getDepositCmd.MarkFlagRequired(ArgFromBlock))
-	fatalIfError(getDepositCmd.MarkFlagRequired(ArgToBlock))
-	fatalIfError(getDepositCmd.MarkFlagRequired(ArgRPCURL))
 
 	// Args for the proof command
 	inputUlxlyArgs.inputFileName = proofCmd.Flags().String(ArgFileName, "", "An ndjson file with deposit data")