From 67be012e3fdf8eb8441e7e5afe90479d3a416726 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Wed, 8 Jul 2020 16:41:46 +0200 Subject: [PATCH] x/genutil: use HomeDir stored in ClientCtx (#6646) Follow-up of #6636 --- x/genutil/client/cli/gentx.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/x/genutil/client/cli/gentx.go b/x/genutil/client/cli/gentx.go index 19043b788..01ab6be58 100644 --- a/x/genutil/client/cli/gentx.go +++ b/x/genutil/client/cli/gentx.go @@ -12,7 +12,6 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - tmcli "github.com/tendermint/tendermint/libs/cli" tmos "github.com/tendermint/tendermint/libs/os" tmtypes "github.com/tendermint/tendermint/types" @@ -92,11 +91,8 @@ func GenTxCmd(mbm module.BasicManager, genBalIterator types.GenesisBalancesItera } keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend) - - clientHome, _ := cmd.Flags().GetString(tmcli.HomeFlag) - inBuf := bufio.NewReader(cmd.InOrStdin()) - kb, err := keyring.New(sdk.KeyringServiceName(), keyringBackend, clientHome, inBuf) + kb, err := keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf) if err != nil { return errors.Wrap(err, "failed to initialize keybase") } @@ -127,7 +123,7 @@ func GenTxCmd(mbm module.BasicManager, genBalIterator types.GenesisBalancesItera return errors.Wrap(err, "failed to validate account in genesis") } - txBldr, err := authtypes.NewTxBuilderFromFlags(inBuf, cmd.Flags(), clientHome) + txBldr, err := authtypes.NewTxBuilderFromFlags(inBuf, cmd.Flags(), clientCtx.HomeDir) if err != nil { return errors.Wrap(err, "error creating tx builder") }