For consistency, change QueryAllUserLimitOrders => QueryAllLimitOrder…

…TrancheUserByAddress
neutron-org · Mar 19, 2024 · 3620004 · 3620004
1 parent 4cb9c06
commit 3620004
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 211 deletions.
diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto
@@ -33,13 +33,13 @@ service Query {
     option (google.api.http).get = "/neutron/dex/limit_order_tranche_user/{address}/{tranche_key}";
   }
 
-  // Queries a list of LimitOrderTrancheMap items.
+  // Queries a list of LimitOrderTranchUser items.
   rpc LimitOrderTrancheUserAll(QueryAllLimitOrderTrancheUserRequest) returns (QueryAllLimitOrderTrancheUserResponse) {
     option (google.api.http).get = "/neutron/dex/limit_order_tranche_user";
   }
 
   // Queries a list of LimitOrderTrancheUser items for a given address.
-  rpc LimitOrderTrancheUserAllByAddress(QueryAllUserLimitOrdersRequest) returns (QueryAllUserLimitOrdersResponse) {
+  rpc LimitOrderTrancheUserAllByAddress(QueryAllLimitOrderTrancheUserByAddressRequest) returns (QueryAllLimitOrderTrancheUserByAddressResponse) {
     option (google.api.http).get = "/neutron/dex/user/limit_orders/{address}";
   }
 
@@ -181,12 +181,12 @@ message QueryAllUserDepositsResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message QueryAllUserLimitOrdersRequest {
+message QueryAllLimitOrderTrancheUserByAddressRequest {
   string address = 1;
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
-message QueryAllUserLimitOrdersResponse {
+message QueryAllLimitOrderTrancheUserByAddressResponse {
   repeated LimitOrderTrancheUser limit_orders = 1 [(gogoproto.nullable) = true];
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }

diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go
@@ -69,7 +69,7 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedStargateQueries {
 		"/neutron.dex.Query/Params":                            &dextypes.QueryParamsResponse{},
 		"/neutron.dex.Query/LimitOrderTrancheUser":             &dextypes.QueryGetLimitOrderTrancheUserResponse{},
 		"/neutron.dex.Query/LimitOrderTrancheUserAll":          &dextypes.QueryAllLimitOrderTrancheUserResponse{},
-		"/neutron.dex.Query/LimitOrderTrancheUserAllByAddress": &dextypes.QueryAllUserLimitOrdersResponse{},
+		"/neutron.dex.Query/LimitOrderTrancheUserAllByAddress": &dextypes.QueryAllLimitOrderTrancheUserByAddressResponse{},
 		"/neutron.dex.Query/LimitOrderTranche":                 &dextypes.QueryGetLimitOrderTrancheResponse{},
 		"/neutron.dex.Query/LimitOrderTrancheAll":              &dextypes.QueryAllLimitOrderTrancheResponse{},
 		"/neutron.dex.Query/UserDepositsAll":                   &dextypes.QueryAllUserDepositsResponse{},

diff --git a/x/dex/client/cli/query_user_limit_orders.go b/x/dex/client/cli/query_user_limit_orders.go
@@ -24,7 +24,7 @@ func CmdListUserLimitOrders() *cobra.Command {
 
 			queryClient := types.NewQueryClient(clientCtx)
 
-			params := &types.QueryAllUserLimitOrdersRequest{
+			params := &types.QueryAllLimitOrderTrancheUserByAddressRequest{
 				Address: reqAddress,
 			}
 

diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user.go b/x/dex/keeper/grpc_query_limit_order_tranche_user.go
@@ -67,8 +67,8 @@ func (k Keeper) LimitOrderTrancheUser(c context.Context,
 
 func (k Keeper) LimitOrderTrancheUserAllByAddress(
 	goCtx context.Context,
-	req *types.QueryAllUserLimitOrdersRequest,
-) (*types.QueryAllUserLimitOrdersResponse, error) {
+	req *types.QueryAllLimitOrderTrancheUserByAddressRequest,
+) (*types.QueryAllLimitOrderTrancheUserByAddressResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "invalid request")
 	}
@@ -96,7 +96,7 @@ func (k Keeper) LimitOrderTrancheUserAllByAddress(
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	return &types.QueryAllUserLimitOrdersResponse{
+	return &types.QueryAllLimitOrderTrancheUserByAddressResponse{
 		LimitOrders: limitOrderTrancheUserList,
 		Pagination:  pageRes,
 	}, nil

diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go b/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go
@@ -132,8 +132,8 @@ func TestLimitOrderTrancheUserAllByAddress(t *testing.T) {
 	address := sample.AccAddress()
 	msgs := createNLimitOrderTrancheUserWithAddress(keeper, ctx, address, 5)
 
-	request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllUserLimitOrdersRequest {
-		return &types.QueryAllUserLimitOrdersRequest{
+	request := func(next []byte, offset, limit uint64, total bool) *types.QueryAllLimitOrderTrancheUserByAddressRequest {
+		return &types.QueryAllLimitOrderTrancheUserByAddressRequest{
 			Address: address,
 			Pagination: &query.PageRequest{
 				Key:        next,