refactor: standardize error handling by replacing Run with RunE and introducing proper error returns in wasp-cli commands

Author: cwarnerdev

tools/wasp-cli/chain/deploy.go

@@ -45,18 +45,21 @@ func initDeployMoveContractCmd() *cobra.Command {
 		Use:   "deploy-move-contract",
 		Short: "Deploy a new move contract and save its package id",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 			defer cancel()
 
 			l1Client := cliclients.L1Client()
 			kp := wallet.Load()
 			packageID, err := l1Client.DeployISCContracts(ctx, cryptolib.SignerToIotaSigner(kp))
-			log.Check(err)
+			if err != nil {
+				return err
+			}
 
 			config.SetPackageID(packageID)
 
 			log.Printf("Move contract deployed.\nPackageID: %v\n", packageID.String())
+			return nil
 		},
 	}
 

tools/wasp-cli/chain/rebuild-index.go

@@ -4,7 +4,6 @@ import (
 	"runtime"
 
 	"fortio.org/safecast"
-	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 
 	hivedb "github.com/iotaledger/hive.go/db"
@@ -22,25 +21,35 @@ func initBuildIndex() *cobra.Command {
 		Use:   "build-index <waspdb path> <indexdb destination path>",
 		Short: "Builds a new EVM JSONRPC index db",
 		Args:  cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			logger := log.HiveLogger()
 
 			waspDBPath := args[0]
 			db, err := database.NewDatabase(hivedb.EngineRocksDB, waspDBPath, false, database.CacheSizeDefault)
-			log.Check(err)
+			if err != nil {
+				return err
+			}
 
-			waspDBStore := indexedstore.New(lo.Must(state.NewStoreReadonly(db.KVStore())))
+			storeRO, err := state.NewStoreReadonly(db.KVStore())
+			if err != nil {
+				return err
+			}
+			waspDBStore := indexedstore.New(storeRO)
 
 			latestIndex, err := waspDBStore.LatestBlockIndex()
-			log.Check(err)
+			if err != nil {
+				return err
+			}
 
 			logger.LogInfo("Creating index in parallel mode.")
 			logger.LogInfof("Latest block index: %d\n", latestIndex)
 
 			index := jsonrpc.NewIndex(waspDBStore.StateByTrieRoot, hivedb.EngineRocksDB, args[1])
 
 			block, err := waspDBStore.StateByIndex(latestIndex)
-			log.Check(err)
+			if err != nil {
+				return err
+			}
 
 			logger.LogInfof("Indexing with %d cores.\n", workers)
 
@@ -51,8 +60,10 @@ func initBuildIndex() *cobra.Command {
 				return waspDBStore
 			}
 
-			err = index.IndexAllBlocksInParallel(logger, storeProvider, block.TrieRoot(), workers)
-			log.Check(err)
+			if err := index.IndexAllBlocksInParallel(logger, storeProvider, block.TrieRoot(), workers); err != nil {
+				return err
+			}
+			return nil
 		},
 	}
 

tools/wasp-cli/codec/cmd.go

@@ -143,12 +143,21 @@ func initDecodeMetadataCmd() *cobra.Command {
 		Use:   "metadata <0x...>",
 		Short: "Translates metadata from Hex to a humanly-readable format",
 		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			metadata, err := isc.RequestMetadataFromBytes(hexutil.MustDecode(args[0]))
-			log.Check(err)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			bytes, err := hexutil.Decode(args[0])
+			if err != nil {
+				return err
+			}
+			metadata, err := isc.RequestMetadataFromBytes(bytes)
+			if err != nil {
+				return err
+			}
 			jsonBytes, err := json.MarshalIndent(metadata, "", "  ")
-			log.Check(err)
+			if err != nil {
+				return err
+			}
 			log.Printf("%s\n", jsonBytes)
+			return nil
 		},
 	}
 }
@@ -158,10 +167,17 @@ func initDecodeGasFeePolicy() *cobra.Command {
 		Use:   "fee-policy <0x...>",
 		Short: "Translates gas fee policy from Hex to a humanly-readable format",
 		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			bytes, err := cryptolib.DecodeHex(args[0])
-			log.Check(err)
-			log.Printf("%v", gas.MustFeePolicyFromBytes(bytes).String())
+			if err != nil {
+				return err
+			}
+			fp, err := gas.FeePolicyFromBytes(bytes)
+			if err != nil {
+				return err
+			}
+			log.Printf("%v", fp.String())
+			return nil
 		},
 	}
 }
@@ -177,18 +193,22 @@ func initEncodeGasFeePolicy() *cobra.Command {
 		Use:   "fee-policy",
 		Short: "Translates metadata from Hex to a humanly-readable format",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			feePolicy := gas.DefaultFeePolicy()
 
 			if gasPerToken != "" {
 				ratio, err := wasputil.Ratio32FromString(gasPerToken)
-				log.Check(err)
+				if err != nil {
+					return err
+				}
 				feePolicy.GasPerToken = ratio
 			}
 
 			if evmGasRatio != "" {
 				ratio, err := wasputil.Ratio32FromString(evmGasRatio)
-				log.Check(err)
+				if err != nil {
+					return err
+				}
 				feePolicy.EVMGasRatio = ratio
 			}
 
@@ -197,6 +217,7 @@ func initEncodeGasFeePolicy() *cobra.Command {
 			}
 
 			log.Printf("%s", cryptolib.EncodeHex(feePolicy.Bytes()))
+			return nil
 		},
 	}
 

tools/wasp-cli/wallet/request-funds.go

@@ -1,8 +1,6 @@
 package wallet
 
 import (
-	"context"
-
 	"github.com/spf13/cobra"
 
 	"github.com/iotaledger/wasp/v2/tools/wasp-cli/util"
@@ -17,18 +15,21 @@ func initRequestFundsCmd() *cobra.Command {
 		Use:   "request-funds",
 		Short: "Request funds from the faucet",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			address := wallet.Load().Address()
-			log.Check(cliclients.L1Client().RequestFunds(context.Background(), *address))
+			if err := cliclients.L1Client().RequestFunds(cmd.Context(), *address); err != nil {
+				return err
+			}
 
 			model := &RequestFundsModel{
 				Address: address.String(),
 				Message: "success",
 			}
 
-			util.TryManageCoinsAmount(context.Background())
+			util.TryManageCoinsAmount(cmd.Context())
 
 			log.PrintCLIOutput(model)
+			return nil
 		},
 	}
 }

tools/wasp-cli/wallet/wallet.go

@@ -21,11 +21,14 @@ func initInitCmd() *cobra.Command {
 		Use:   "init",
 		Short: "Initialize a new wallet",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			wallet.InitWallet(initOverwrite)
 
 			config.SetWalletProviderString(string(wallet.GetWalletProvider()))
-			log.Check(config.WriteConfig())
+			if err := config.WriteConfig(); err != nil {
+				return err
+			}
+			return nil
 		},
 	}
 	cmd.Flags().BoolVar(&initOverwrite, "overwrite", false, "allow overwriting existing seed")

tools/wasp-cli/wallet/wallet_provider.go

@@ -12,14 +12,19 @@ func initWalletProviderCmd() *cobra.Command {
 		Use:   "provider (keychain, ledger)",
 		Short: "Get or set wallet provider (keychain, ledger)",
 		Args:  cobra.MaximumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
 				log.Printf("Wallet provider: %s\n", string(wallet.GetWalletProvider()))
-				return
+				return nil
 			}
 
-			log.Check(wallet.SetWalletProvider(wallet.WalletProvider(args[0])))
-			log.Check(config.WriteConfig())
+			if err := wallet.SetWalletProvider(wallet.WalletProvider(args[0])); err != nil {
+				return err
+			}
+			if err := config.WriteConfig(); err != nil {
+				return err
+			}
+			return nil
 		},
 	}
 }