* 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)
(cherry picked from commit cc1a1c8cd0
)
# Conflicts:
# CHANGELOG.md
* merge conflicts
Co-authored-by: Arijit Das <arijitad.in@gmail.com>
Co-authored-by: Amaury M <1293565+amaurym@users.noreply.github.com>
This commit is contained in:
parent
8a73b266f5
commit
fece3f0485
|
@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* (client) [#10226](https://github.com/cosmos/cosmos-sdk/pull/10226) Fix --home flag parsing.
|
||||
|
||||
## [v0.44.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.44.1) - 2021-09-29
|
||||
|
||||
### Improvements
|
||||
|
|
|
@ -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.
|
||||
//
|
||||
|
|
|
@ -57,7 +57,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 {
|
||||
|
@ -67,7 +66,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 {
|
||||
|
|
|
@ -56,9 +56,12 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
|
|||
cmd.SetOut(cmd.OutOrStdout())
|
||||
cmd.SetErr(cmd.ErrOrStderr())
|
||||
|
||||
initClientCtx = client.ReadHomeFlag(initClientCtx, cmd)
|
||||
initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
initClientCtx, err := config.ReadFromClientConfig(initClientCtx)
|
||||
initClientCtx, err = config.ReadFromClientConfig(initClientCtx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -76,8 +76,6 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
|
|||
|
||||
serverCtx := server.GetServerContextFromCmd(cmd)
|
||||
config := serverCtx.Config
|
||||
|
||||
clientCtx = client.ReadHomeFlag(clientCtx, cmd)
|
||||
config.SetRoot(clientCtx.HomeDir)
|
||||
|
||||
chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
|
||||
|
|
Loading…
Reference in New Issue