certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x/genutil: use HomeDir stored in ClientCtx (#6646) 

Follow-up of #6636
This commit is contained in:
Alessio Treglia 2020-07-08 16:41:46 +02:00 committed by GitHub
parent 33decc9779
commit 67be012e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x/genutil/client/cli/gentx.go
View File

@ -12,7 +12,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
tmcli "github.com/tendermint/tendermint/libs/cli"
tmos "github.com/tendermint/tendermint/libs/os" tmos "github.com/tendermint/tendermint/libs/os"
tmtypes "github.com/tendermint/tendermint/types" tmtypes "github.com/tendermint/tendermint/types"
@ -92,11 +91,8 @@ func GenTxCmd(mbm module.BasicManager, genBalIterator types.GenesisBalancesItera
} }
keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend) keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
clientHome, _ := cmd.Flags().GetString(tmcli.HomeFlag)
inBuf := bufio.NewReader(cmd.InOrStdin()) 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 { if err != nil {
return errors.Wrap(err, "failed to initialize keybase") 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") 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 { if err != nil {
return errors.Wrap(err, "error creating tx builder") return errors.Wrap(err, "error creating tx builder")
} }