Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

keyring-dir flag #7485

Merged
merged 11 commits into from
Oct 8, 2020
Merged

keyring-dir flag #7485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9a0cbdd
initial commit
alexanderbez Oct 8, 2020
0e525e8
update cmds
alexanderbez Oct 8, 2020
eb940e1
cl++
alexanderbez Oct 8, 2020
a0e7472
Merge branch 'master' into bez/keyring-dir-flag
Oct 8, 2020
9fd9b76
Merge branch 'master' into bez/keyring-dir-flag
alexanderbez Oct 8, 2020
016c273
use GetClientContextFromCmd
alexanderbez Oct 8, 2020
07102ae
Merge branch 'bez/keyring-dir-flag' of github.com:cosmos/cosmos-sdk i…
alexanderbez Oct 8, 2020
ce648a6
fix Test_runDeleteCmd
alexanderbez Oct 8, 2020
8654987
fix tests++
alexanderbez Oct 8, 2020
9d3d732
fix tests++
alexanderbez Oct 8, 2020
ab33e55
fix TestSetCmdClientContextHandler
alexanderbez Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update cmds
  • Loading branch information
@alexanderbez
alexanderbez committed Oct 8, 2020
commit 0e525e8bff05f798292a221e1a114acf916d6dea
6 changes: 3 additions & 3 deletions client/keys/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ the flag --nosort is set.
func runAddCmd(cmd *cobra.Command, args []string) error {
buf := bufio.NewReader(cmd.InOrStdin())

homeDir, _ := cmd.Flags().GetString(flags.FlagHome)
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)
dryRun, _ := cmd.Flags().GetBool(flags.FlagHome)

var (
Expand All @@ -94,10 +94,10 @@ func runAddCmd(cmd *cobra.Command, args []string) error {
)

if dryRun {
kr, err = keyring.New(sdk.KeyringServiceName(), keyring.BackendMemory, homeDir, buf)
kr, err = keyring.New(sdk.KeyringServiceName(), keyring.BackendMemory, keyringDir, buf)
} else {
backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
kr, err = keyring.New(sdk.KeyringServiceName(), backend, homeDir, buf)
kr, err = keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
}

if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions client/keys/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ private keys stored in a ledger device cannot be deleted with the CLI.
buf := bufio.NewReader(cmd.InOrStdin())

backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
homeDir, _ := cmd.Flags().GetString(flags.FlagHome)
kb, err := keyring.New(sdk.KeyringServiceName(), backend, homeDir, buf)
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)

kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
if err != nil {
return err
}
Expand Down
5 changes: 3 additions & 2 deletions client/keys/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ func ExportKeyCommand() *cobra.Command {
buf := bufio.NewReader(cmd.InOrStdin())

backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
homeDir, _ := cmd.Flags().GetString(flags.FlagHome)
kb, err := keyring.New(sdk.KeyringServiceName(), backend, homeDir, buf)
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)

kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
if err != nil {
return err
}
Expand Down
5 changes: 3 additions & 2 deletions client/keys/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ func ImportKeyCommand() *cobra.Command {
buf := bufio.NewReader(cmd.InOrStdin())

backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
homeDir, _ := cmd.Flags().GetString(flags.FlagHome)
kb, err := keyring.New(sdk.KeyringServiceName(), backend, homeDir, buf)
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)

kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, buf)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions client/keys/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ along with their associated name and address.`,
func runListCmd(cmd *cobra.Command, _ []string) error {
backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)

kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, cmd.InOrStdin())
if err != nil {
return err
Expand Down
5 changes: 3 additions & 2 deletions client/keys/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ func runShowCmd(cmd *cobra.Command, args []string) (err error) {
var info keyring.Info

backend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)
homeDir, _ := cmd.Flags().GetString(flags.FlagHome)
kb, err := keyring.New(sdk.KeyringServiceName(), backend, homeDir, cmd.InOrStdin())
keyringDir, _ := cmd.Flags().GetString(flags.FlagKeyringDir)

kb, err := keyring.New(sdk.KeyringServiceName(), backend, keyringDir, cmd.InOrStdin())
if err != nil {
return err
}
Expand Down