renamed token-balances to denom-owners

proto/umee/ugov/v1/query.proto

@@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "amino/amino.proto";
+import "cosmos/bank/v1beta1/query.proto";
 
 import "umee/ugov/v1/ugov.proto";
 
@@ -37,42 +37,23 @@ service Query {
     option (google.api.http).get = "/umee/ugov/v1/inflation_cycle_end";
   }
 
-  // Token Balances queries for all account addresses that own a particular token
+  // DenomOwners queries for all account addresses that own a particular token
   // denomination.
-  rpc TokenBalances(QueryTokenBalances) returns (QueryTokenBalancesResponse){
-    option (google.api.http).get = "/umee/ugov/v1/token_balances";
+  rpc DenomOwners(QueryDenomOwners) returns (cosmos.bank.v1beta1.QueryDenomOwnersResponse){
+    option (google.api.http).get = "/umee/ugov/v1/denom_owners";
   }
 }
 
-// which queries for a paginated set of all account holders of a particular
+// QueryDenomOwners which queries for a paginated set of all account holders of a particular
 // denomination.
-message QueryTokenBalances{
+message QueryDenomOwners{
   // denom defines the coin denomination to query all account holders for.
   string denom = 1;
   int64 height = 2;
   // pagination defines an optional pagination for the request.
   cosmos.base.query.v1beta1.PageRequest pagination = 3;
 }
 
-// QueryDenomOwnersResponse defines the RPC response of a TokenBalances RPC query.
-message QueryTokenBalancesResponse {
-  repeated TokenBalance token_balances = 1;
-   // pagination defines the pagination in the response.
-   cosmos.base.query.v1beta1.PageResponse pagination = 2;
-}
-
-// TokenBalance defines structure representing an account that owns or holds a
-// particular denominated token. It contains the account address and account
-// balance of the denominated token.
-//
-message TokenBalance {
-  // address defines the address that owns a particular denomination.
-  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
-
-  // balance is the balance of the denominated coin for an account.
-  cosmos.base.v1beta1.Coin balance = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
-}
-
 // QueryMinGasPrice is a request type.
 message QueryMinGasPrice {}
 

x/ugov/client/cli/query.go

@@ -25,7 +25,7 @@ func GetQueryCmd() *cobra.Command {
 		QueryInflationParams(),
 		QueryInflationCyleEnd(),
 		QueryEmergencyGroup(),
-		QueryTokenBalances(),
+		QueryDenomOwners(),
 	)
 
 	return cmd
@@ -123,10 +123,10 @@ func QueryInflationCyleEnd() *cobra.Command {
 	return cmd
 }
 
-// QueryTokenBalances creates the Query/TokenBalances CLI.
-func QueryTokenBalances() *cobra.Command {
+// QueryDenomOwners creates the Query/DenomOwners CLI.
+func QueryDenomOwners() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "token-balances [denom]",
+		Use:   "denom-owners [denom]",
 		Args:  cobra.ExactArgs(1),
 		Short: "Queries for all account addresses that own a particular token denomination.",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -139,7 +139,7 @@ func QueryTokenBalances() *cobra.Command {
 				return err
 			}
 			queryClient := ugov.NewQueryClient(clientCtx)
-			resp, err := queryClient.TokenBalances(cmd.Context(), &ugov.QueryTokenBalances{
+			resp, err := queryClient.DenomOwners(cmd.Context(), &ugov.QueryDenomOwners{
 				Denom:      args[0],
 				Pagination: pageReq,
 			})
@@ -148,7 +148,7 @@ func QueryTokenBalances() *cobra.Command {
 	}
 
 	flags.AddQueryFlagsToCmd(cmd)
-	flags.AddPaginationFlagsToCmd(cmd, "token-balances")
+	flags.AddPaginationFlagsToCmd(cmd, "denom-owners")
 
 	return cmd
 }

x/ugov/keeper/query_server.go

@@ -52,28 +52,15 @@ func (q Querier) InflationCycleEnd(ctx context.Context, _ *ugov.QueryInflationCy
 	return &ugov.QueryInflationCycleEndResponse{End: &cycleEndTime}, nil
 }
 
-// TokenBalances implements ugov.QueryServer.
-func (q Querier) TokenBalances(ctx context.Context, req *ugov.QueryTokenBalances) (*ugov.QueryTokenBalancesResponse,
+// DenomOwners implements ugov.QueryServer.
+func (q Querier) DenomOwners(ctx context.Context, req *ugov.QueryDenomOwners) (*banktypes.QueryDenomOwnersResponse,
 	error) {
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	if req.Height != 0 {
 		sdkCtx = sdkCtx.WithBlockHeight(req.Height)
 	}
-	resp, err := q.BankKeeper.DenomOwners(sdk.WrapSDKContext(sdkCtx), &banktypes.QueryDenomOwnersRequest{
+	return q.BankKeeper.DenomOwners(sdk.WrapSDKContext(sdkCtx), &banktypes.QueryDenomOwnersRequest{
 		Denom:      req.Denom,
 		Pagination: req.Pagination,
 	})
-	if err != nil {
-		return nil, err
-	}
-
-	tb := make([]*ugov.TokenBalance, 0)
-	for _, v := range resp.DenomOwners {
-		tb = append(tb, &ugov.TokenBalance{
-			Address: v.Address,
-			Balance: v.Balance,
-		})
-	}
-
-	return &ugov.QueryTokenBalancesResponse{Pagination: resp.Pagination, TokenBalances: tb}, nil
 }