From 1ad812fc941ea7884d47be1e2af0e70e5a587bb3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 27 May 2022 11:31:40 +0200 Subject: [PATCH] fix: cli `grants-by-grantee`, `grants-by-granter` cmds (backport #11983) (#12025) * fix: cli `grants-by-grantee`, `grants-by-granter` cmds (#11983) ref: #11362 --- *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... - [ ] 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 - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/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/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] 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 *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) (cherry picked from commit f470d402a59658cf2f40ea8ef5020994bdfc0ca1) * add alias * conflicts * fix * remove unneeded files * Update x/authz/client/cli/query.go Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com> Co-authored-by: atheesh Co-authored-by: marbar3778 Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com> --- CHANGELOG.md | 1 + x/authz/client/cli/query.go | 18 ++++++----- x/feegrant/client/cli/query.go | 57 ++++------------------------------ 3 files changed, 17 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8ef7a43a797e..5a507107d05a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#11772](https://github.com/cosmos/cosmos-sdk/pull/11772) Limit types.Dec length to avoid overflow. * [\#10947](https://github.com/cosmos/cosmos-sdk/pull/10947) Add `AllowancesByGranter` query to the feegrant module * [\#9639](https://github.com/cosmos/cosmos-sdk/pull/9639) Check store keys length before accessing them by making sure that `key` is of length `m+1` (for `key[n:m]`) +* [\#11983](https://github.com/cosmos/cosmos-sdk/pull/11983) (x/feegrant, x/authz) rename grants query commands to `grants-by-grantee`, `grants-by-granter` cmds. ## Improvements diff --git a/x/authz/client/cli/query.go b/x/authz/client/cli/query.go index dfc997c445e49..c26b229f2dbbd 100644 --- a/x/authz/client/cli/query.go +++ b/x/authz/client/cli/query.go @@ -96,13 +96,14 @@ $ %s query %s grants cosmos1skjw.. cosmos1skjwj.. %s func GetQueryGranterGrants() *cobra.Command { cmd := &cobra.Command{ - Use: "granter-grants [granter-addr]", - Args: cobra.ExactArgs(1), - Short: "query authorization grants granted by granter", + Use: "grants-by-granter [granter-addr]", + Aliases: []string{"granter-grants"}, + Args: cobra.ExactArgs(1), + Short: "query authorization grants granted by granter", Long: strings.TrimSpace( fmt.Sprintf(`Query authorization grants granted by granter. Examples: -$ %s q %s granter-grants cosmos1skj.. +$ %s q %s grants-by-granter cosmos1skj.. `, version.AppName, authz.ModuleName), ), @@ -144,13 +145,14 @@ $ %s q %s granter-grants cosmos1skj.. func GetQueryGranteeGrants() *cobra.Command { cmd := &cobra.Command{ - Use: "grantee-grants [grantee-addr]", - Args: cobra.ExactArgs(1), - Short: "query authorization grants granted to a grantee", + Use: "grants-by-grantee [grantee-addr]", + Aliases: []string{"grantee-grants"}, + Args: cobra.ExactArgs(1), + Short: "query authorization grants granted to a grantee", Long: strings.TrimSpace( fmt.Sprintf(`Query authorization grants granted to a grantee. Examples: -$ %s q %s grantee-grants cosmos1skj.. +$ %s q %s grants-by-grantee cosmos1skj.. `, version.AppName, authz.ModuleName), ), diff --git a/x/feegrant/client/cli/query.go b/x/feegrant/client/cli/query.go index 2b571c71791f8..fe1323e0af4c2 100644 --- a/x/feegrant/client/cli/query.go +++ b/x/feegrant/client/cli/query.go @@ -67,6 +67,7 @@ $ %s query feegrant grant [granter] [grantee] Grantee: granteeAddr.String(), }, ) + if err != nil { return err } @@ -83,9 +84,10 @@ $ %s query feegrant grant [granter] [grantee] // GetCmdQueryFeeGrantsByGrantee returns cmd to query for all grants for a grantee. func GetCmdQueryFeeGrantsByGrantee() *cobra.Command { cmd := &cobra.Command{ - Use: "grants-by-grantee [grantee]", - Args: cobra.ExactArgs(1), - Short: "Query all grants of a grantee", + Use: "grants-by-grantee [grantee]", + Aliases: []string{"grants"}, + Args: cobra.ExactArgs(1), + Short: "Query all grants of a grantee", Long: strings.TrimSpace( fmt.Sprintf(`Queries all the grants for a grantee address. @@ -114,6 +116,7 @@ $ %s query feegrant grants-by-grantee [grantee] Pagination: pageReq, }, ) + if err != nil { return err } @@ -155,54 +158,6 @@ $ %s query feegrant grants-by-granter [granter] return err } - res, err := queryClient.AllowancesByGranter( - cmd.Context(), - &feegrant.QueryAllowancesByGranterRequest{ - Granter: granterAddr.String(), - Pagination: pageReq, - }, - ) - if err != nil { - return err - } - - return clientCtx.PrintProto(res) - }, - } - - flags.AddQueryFlagsToCmd(cmd) - flags.AddPaginationFlagsToCmd(cmd, "grants") - - return cmd -} - -// GetCmdQueryFeeGrantsByGranter returns cmd to query for all grants by a granter. -func GetCmdQueryFeeGrantsByGranter() *cobra.Command { - cmd := &cobra.Command{ - Use: "grants [granter]", - Args: cobra.ExactArgs(1), - Short: "Query all grants by a granter", - Long: strings.TrimSpace( - fmt.Sprintf(`Queries all the grants issued for a granter address. - -Example: -$ %s query feegrant grants [granter] -`, version.AppName), - ), - RunE: func(cmd *cobra.Command, args []string) error { - clientCtx := client.GetClientContextFromCmd(cmd) - queryClient := feegrant.NewQueryClient(clientCtx) - - granterAddr, err := sdk.AccAddressFromBech32(args[0]) - if err != nil { - return err - } - - pageReq, err := client.ReadPageRequest(cmd.Flags()) - if err != nil { - return err - } - res, err := queryClient.AllowancesByGranter( cmd.Context(), &feegrant.QueryAllowancesByGranterRequest{