refactor: return limit exceeded error on out of gas

x/logic/keeper/grpc_query_ask_test.go

@@ -142,15 +142,15 @@ func TestGRPCAsk(t *testing.T) {
 			{
 				query:         "bank_balances(X, Y).",
 				maxGas:        3000,
-				expectedError: "error executing query: out of gas in location: panic: {ValuePerByte}: out of gas: invalid argument",
+				expectedError: "out of gas: logic <panic: {ValuePerByte}> (4204/3000): limit exceeded",
 			},
 			{
 				query:  "block_height(X).",
 				maxGas: 3000,
 				predicateCosts: map[string]uint64{
 					"block_height/1": 10000,
 				},
-				expectedError: "error executing query: out of gas in location: block_height/1: out of gas: invalid argument",
+				expectedError: "out of gas: logic <block_height/1> (12353/3000): limit exceeded",
 			},
 			{
 				program: "father(bob, 'élodie').",

x/logic/keeper/interpreter.go

@@ -16,7 +16,6 @@ import (
 	storetypes "cosmossdk.io/store/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/axone-protocol/axoned/v8/x/logic/fs/filtered"
 	"github.com/axone-protocol/axoned/v8/x/logic/interpreter"
@@ -67,7 +66,7 @@ func (k Keeper) execute(
 
 	answer, err := k.queryInterpreter(ctx, i, query, sdkmath.MinUint(solutionsLimit, *limits.MaxResultCount))
 	if err != nil {
-		return nil, errorsmod.Wrapf(types.InvalidArgument, "error executing query: %v", err.Error())
+		return nil, err
 	}
 
 	return &types.QueryServiceAskResponse{
@@ -110,15 +109,15 @@ func (k Keeper) newInterpreter(ctx context.Context) (*prolog.Interpreter, fmt.St
 				if r := recover(); r != nil {
 					switch rType := r.(type) {
 					case storetypes.ErrorOutOfGas:
-						err = errorsmod.Wrapf(sdkerrors.ErrOutOfGas, "out of gas in location: %v", rType.Descriptor)
+						err = errorsmod.Wrapf(
+							types.LimitExceeded, "out of gas: %s <%s> (%d/%d)",
+							types.ModuleName, rType.Descriptor, sdkctx.GasMeter().GasConsumed(), sdkctx.GasMeter().Limit())
 					default:
 						panic(r)
 					}
 				}
 			}()
-
 			gasMeter.ConsumeGas(cost, predicate)
-
 			return err
 		}
 	}

x/logic/util/prolog.go

@@ -13,7 +13,6 @@ import (
 	sdkmath "cosmossdk.io/math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/axone-protocol/axoned/v8/x/logic/types"
 )
@@ -29,7 +28,7 @@ func QueryInterpreter(
 	p := engine.NewParser(&i.VM, strings.NewReader(query))
 	t, err := p.Term()
 	if err != nil {
-		return nil, err
+		return nil, errorsmod.Wrapf(types.InvalidArgument, "error executing query: %v", err.Error())
 	}
 
 	var env *engine.Env
@@ -47,17 +46,21 @@ func QueryInterpreter(
 
 	results, err := envsToResults(envs, p.Vars, i)
 	if err != nil {
-		return nil, err
+		return nil, errorsmod.Wrapf(types.InvalidArgument, "error executing query: %v", err.Error())
 	}
 
 	if callErr != nil {
 		if sdkmath.NewUint(uint64(len(results))).LT(solutionsLimit) {
 			// error is not part of the look-ahead and should be included in the solutions
+			sdkCtx := sdk.UnwrapSDKContext(ctx)
+
 			switch {
-			case errors.Is(callErr, sdkerrors.ErrOutOfGas):
+			case errors.Is(callErr, types.LimitExceeded):
 				return nil, callErr
-			case sdk.UnwrapSDKContext(ctx).GasMeter().IsOutOfGas():
-				return nil, errorsmod.Wrapf(sdkerrors.ErrOutOfGas, "out of gas in location: %v", callErr.Error())
+			case sdkCtx.GasMeter().IsOutOfGas():
+				return nil, errorsmod.Wrapf(
+					types.LimitExceeded, "out of gas: %s <%s> (%d/%d)",
+					types.ModuleName, callErr.Error(), sdkCtx.GasMeter().GasConsumed(), sdkCtx.GasMeter().Limit())
 			default:
 				results = append(results, types.Result{Error: callErr.Error()})
 			}