refactor: inline flags.GetKeyringDir and remove it

client/cmd.go

@@ -103,8 +103,11 @@ func ReadPersistentCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Cont
 	}
 
 	if clientCtx.Keyring == nil || flagSet.Changed(flags.FlagKeyringBackend) {
+		keyringDir, _ := flagSet.GetString(flags.FlagKeyringDir)
+		if keyringDir == "" {
+			keyringDir, _ = flagSet.GetString(flags.FlagHome)
+		}
 		keyringBackend, _ := flagSet.GetString(flags.FlagKeyringBackend)
-		keyringDir, _ := flags.GetKeyringDir(flagSet, clientCtx.HomeDir)
 
 		if keyringBackend != "" {
 			kr, err := newKeyringFromFlags(clientCtx, keyringBackend, keyringDir)

client/flags/flags.go

@@ -5,7 +5,6 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -114,20 +113,6 @@ func AddTxFlagsToCmd(cmd *cobra.Command) {
 	cmd.SetOut(cmd.OutOrStdout())
 }
 
-// GetKeyringDir finds the directory for the keyring storage
-func GetKeyringDir(pflags *pflag.FlagSet, homeDir string) (string, error) {
-	keyringDir, err := pflags.GetString(FlagKeyringDir)
-	if keyringDir == "" {
-		// Use the specified home directory.
-		keyringDir = homeDir
-	}
-	if keyringDir == "" {
-		// Default to the node's home directory.
-		keyringDir, err = pflags.GetString(FlagHome)
-	}
-	return keyringDir, err
-}
-
 // AddPaginationFlagsToCmd adds common pagination flags to cmd
 func AddPaginationFlagsToCmd(cmd *cobra.Command, query string) {
 	cmd.Flags().Uint64(FlagPage, 1, fmt.Sprintf("pagination page of %s to query for. This sets offset to a multiple of limit", query))

client/keys/add.go

@@ -85,7 +85,10 @@ the flag --nosort is set.
 func runAddCmd(cmd *cobra.Command, args []string) error {
 	buf := bufio.NewReader(cmd.InOrStdin())
 
-	keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
+	keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+	if keyringDir == "" {
+		keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+	}
 	dryRun, _ := cmd.Flags().GetBool(flags.FlagDryRun)
 
 	var (

client/keys/delete.go

@@ -31,8 +31,11 @@ private keys stored in a ledger device cannot be deleted with the CLI.
 		RunE: func(cmd *cobra.Command, args []string) error {
 			buf := bufio.NewReader(cmd.InOrStdin())
 
+			keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+			if keyringDir == "" {
+				keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+			}
 			backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-			keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
 			kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
 			if err != nil {
 				return err

client/keys/export.go

@@ -21,8 +21,11 @@ func ExportKeyCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			buf := bufio.NewReader(cmd.InOrStdin())
 
+			keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+			if keyringDir == "" {
+				keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+			}
 			backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-			keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
 			kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
 			if err != nil {
 				return err

client/keys/import.go

@@ -22,8 +22,12 @@ func ImportKeyCommand() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			buf := bufio.NewReader(cmd.InOrStdin())
 
+			keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+			if keyringDir == "" {
+				keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+			}
 			backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-			keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
+
 			kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
 			if err != nil {
 				return err

client/keys/list.go

@@ -26,8 +26,12 @@ along with their associated name and address.`,
 }
 
 func runListCmd(cmd *cobra.Command, _ []string) error {
+	keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+	if keyringDir == "" {
+		keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+	}
 	backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-	keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
+
 	kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, cmd.InOrStdin())
 	if err != nil {
 		return err

client/keys/migrate.go

@@ -40,7 +40,10 @@ It is recommended to run in 'dry-run' mode first to verify all key migration mat
 }
 
 func runMigrateCmd(cmd *cobra.Command, args []string) error {
-	keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
+	keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+	if keyringDir == "" {
+		keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+	}
 
 	// instantiate legacy keybase
 	var legacyKb keyring.LegacyKeybase

client/keys/show.go

@@ -54,8 +54,11 @@ consisting of all the keys provided by name and multisig threshold.`,
 func runShowCmd(cmd *cobra.Command, args []string) (err error) {
 	var info keyring.Info
 
+	keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+	if keyringDir == "" {
+		keyringDir, _ = cmd.Flags().GetString(flags.FlagHome)
+	}
 	backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-	keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), "")
 	kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, cmd.InOrStdin())
 	if err != nil {
 		return err

simapp/simd/cmd/genaccounts.go

@@ -51,7 +51,11 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 			addr, err := sdk.AccAddressFromBech32(args[0])
 			if err != nil {
 				inBuf := bufio.NewReader(cmd.InOrStdin())
-				keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), clientCtx.HomeDir)
+
+				keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+				if keyringDir == "" {
+					keyringDir = clientCtx.HomeDir
+				}
 				keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
 
 				// attempt to lookup address from Keybase if no address was provided

x/auth/client/cli/tx_multisign.go

@@ -82,8 +82,11 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
+		keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
+		if keyringDir == "" {
+			keyringDir = clientCtx.HomeDir
+		}
 		backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
-		keyringDir, _ := flags.GetKeyringDir(cmd.Flags(), clientCtx.HomeDir)
 
 		inBuf := bufio.NewReader(cmd.InOrStdin())
 		kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, inBuf)