fix: --home flag parsing (#10226)
<!-- The default pull request template is for types feat, fix, or refactor. For other templates, add one of the following parameters to the url: - template=docs.md - template=other.md --> ## Description Closes: #XXXX <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [x] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [x] reviewed state machine logic - [x] reviewed API design and naming - [x] reviewed documentation is accurate - [x] reviewed tests and test coverage - [x] manually tested (if applicable)
This commit is contained in:
+5
-11
@@ -93,6 +93,11 @@ func ReadPersistentCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Cont
|
||||
clientCtx = clientCtx.WithOutputFormat(output)
|
||||
}
|
||||
|
||||
if clientCtx.HomeDir == "" || flagSet.Changed(flags.FlagHome) {
|
||||
homeDir, _ := flagSet.GetString(flags.FlagHome)
|
||||
clientCtx = clientCtx.WithHomeDir(homeDir)
|
||||
}
|
||||
|
||||
if !clientCtx.Simulate || flagSet.Changed(flags.FlagDryRun) {
|
||||
dryRun, _ := flagSet.GetBool(flags.FlagDryRun)
|
||||
clientCtx = clientCtx.WithSimulation(dryRun)
|
||||
@@ -249,17 +254,6 @@ func readTxCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Context, err
|
||||
return clientCtx, nil
|
||||
}
|
||||
|
||||
// ReadHomeFlag checks if home flag is changed. If this is a case, we update
|
||||
// HomeDir field of Client Context.
|
||||
func ReadHomeFlag(clientCtx Context, cmd *cobra.Command) Context {
|
||||
if cmd.Flags().Changed(flags.FlagHome) {
|
||||
rootDir, _ := cmd.Flags().GetString(flags.FlagHome)
|
||||
clientCtx = clientCtx.WithHomeDir(rootDir)
|
||||
}
|
||||
|
||||
return clientCtx
|
||||
}
|
||||
|
||||
// GetClientQueryContext returns a Context from a command with fields set based on flags
|
||||
// defined in AddQueryFlagsToCmd. An error is returned if any flag query fails.
|
||||
//
|
||||
|
||||
@@ -59,7 +59,6 @@ func Test_runListCmd(t *testing.T) {
|
||||
cmd.SetArgs([]string{
|
||||
fmt.Sprintf("--%s=%s", flags.FlagHome, tt.kbDir),
|
||||
fmt.Sprintf("--%s=false", flagListNames),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
|
||||
})
|
||||
|
||||
if err := cmd.ExecuteContext(ctx); (err != nil) != tt.wantErr {
|
||||
@@ -69,7 +68,6 @@ func Test_runListCmd(t *testing.T) {
|
||||
cmd.SetArgs([]string{
|
||||
fmt.Sprintf("--%s=%s", flags.FlagHome, tt.kbDir),
|
||||
fmt.Sprintf("--%s=true", flagListNames),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagKeyringBackend, keyring.BackendTest),
|
||||
})
|
||||
|
||||
if err := cmd.ExecuteContext(ctx); (err != nil) != tt.wantErr {
|
||||
|
||||
Reference in New Issue
Block a user