Skip to content

Commit 0ae07fe

Browse files
authored
fix: duplicate vesting and format (cosmos#9535)
<!-- 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 <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> This pull request fixes the duplicate `vesting` command displayed with `--help` for the `tx` command. It also removes line breaks for consistent formatting across all commands and it fixes a minor typo. ## Manual Test ``` make build ``` ``` ./build/simd tx -h ``` ``` ./build/simd tx vesting -h ``` --- ### 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 - [x] added `!` to the type prefix if API or client breaking change - *n/a* - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - *n/a* - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - *n/a* - [x] 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` - [x] included comments for [documenting Go code](https://blog.golang.org/godoc) - [x] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] 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... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
1 parent 0e64fa7 commit 0ae07fe

File tree

5 files changed

+2
-9
lines changed

5 files changed

+2
-9
lines changed

client/keys/root.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ The pass backend requires GnuPG: https://gnupg.org/
4444
ImportKeyCommand(),
4545
ListKeysCmd(),
4646
ShowKeysCmd(),
47-
flags.LineBreak,
4847
DeleteKeyCommand(),
4948
ParseKeyStringCommand(),
5049
MigrateCommand(),

client/keys/root_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ func TestCommands(t *testing.T) {
1111
assert.NotNil(t, rootCommands)
1212

1313
// Commands are registered
14-
assert.Equal(t, 10, len(rootCommands.Commands()))
14+
assert.Equal(t, 9, len(rootCommands.Commands()))
1515
}

server/util.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,8 @@ func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator type
264264
rootCmd.AddCommand(
265265
startCmd,
266266
UnsafeResetAllCmd(),
267-
flags.LineBreak,
268267
tendermintCmd,
269268
ExportCmd(appExport, defaultNodeHome),
270-
flags.LineBreak,
271269
version.NewVersionCommand(),
272270
)
273271
}

simapp/simd/cmd/root.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
sdk "github.com/cosmos/cosmos-sdk/types"
2929
authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
3030
"github.com/cosmos/cosmos-sdk/x/auth/types"
31-
vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
3231
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
3332
"github.com/cosmos/cosmos-sdk/x/crisis"
3433
genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
@@ -151,12 +150,9 @@ func txCommand() *cobra.Command {
151150
authcmd.GetMultiSignCommand(),
152151
authcmd.GetMultiSignBatchCmd(),
153152
authcmd.GetValidateSignaturesCommand(),
154-
flags.LineBreak,
155153
authcmd.GetBroadcastCommand(),
156154
authcmd.GetEncodeCommand(),
157155
authcmd.GetDecodeCommand(),
158-
flags.LineBreak,
159-
vestingcli.GetTxCmd(),
160156
)
161157

162158
simapp.ModuleBasics.AddTxCommands(cmd)

x/auth/client/cli/decode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const flagHex = "hex"
1717
func GetDecodeCommand() *cobra.Command {
1818
cmd := &cobra.Command{
1919
Use: "decode [amino-byte-string]",
20-
Short: "Decode an binary encoded transaction string.",
20+
Short: "Decode a binary encoded transaction string",
2121
Args: cobra.ExactArgs(1),
2222
RunE: func(cmd *cobra.Command, args []string) (err error) {
2323
clientCtx := client.GetClientContextFromCmd(cmd)

0 commit comments

Comments
 (0)