From e80ad614733a0fbb189b0331b7aa8367467747fc Mon Sep 17 00:00:00 2001 From: frojdidymylja Date: Wed, 4 Nov 2020 20:23:54 +0100 Subject: [PATCH] fix: bank gRPC error status codes --- x/bank/keeper/grpc_query.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x/bank/keeper/grpc_query.go b/x/bank/keeper/grpc_query.go index bb0a5b176cda..a71d0d72c0f3 100644 --- a/x/bank/keeper/grpc_query.go +++ b/x/bank/keeper/grpc_query.go @@ -31,7 +31,7 @@ func (k BaseKeeper) Balance(ctx context.Context, req *types.QueryBalanceRequest) sdkCtx := sdk.UnwrapSDKContext(ctx) address, err := sdk.AccAddressFromBech32(req.Address) if err != nil { - return nil, err + return nil, status.Errorf(codes.InvalidArgument, "invalid address: %s", err.Error()) } balance := k.GetBalance(sdkCtx, address, req.Denom) @@ -45,9 +45,13 @@ func (k BaseKeeper) AllBalances(ctx context.Context, req *types.QueryAllBalances return nil, status.Error(codes.InvalidArgument, "empty request") } + if req.Address == "" { + return nil, status.Error(codes.InvalidArgument, "address cannot be empty") + } + addr, err := sdk.AccAddressFromBech32(req.Address) if err != nil { - return nil, err + return nil, status.Errorf(codes.InvalidArgument, "invalid address: %s", err.Error()) } sdkCtx := sdk.UnwrapSDKContext(ctx)