From 0381b1a2bf5280d95532b63ffa2c0674a8cf4514 Mon Sep 17 00:00:00 2001
From: aljo242 <alex@skip.money>
Date: Tue, 4 Jun 2024 11:52:39 -0400
Subject: [PATCH] enable all

---
 x/feemarket/ante/fee_test.go    | 4 ++--
 x/feemarket/ante/suite/suite.go | 4 ++++
 x/feemarket/post/fee.go         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/x/feemarket/ante/fee_test.go b/x/feemarket/ante/fee_test.go
index 86aa4d7..b170d53 100644
--- a/x/feemarket/ante/fee_test.go
+++ b/x/feemarket/ante/fee_test.go
@@ -39,7 +39,7 @@ func TestAnteHandle(t *testing.T) {
 			RunPost:  false,
 			Simulate: false,
 			ExpPass:  false,
-			ExpErr:   sdkerrors.ErrInvalidGasLimit,
+			ExpErr:   sdkerrors.ErrOutOfGas,
 		},
 		// test --gas=auto flag settings
 		// when --gas=auto is set, cosmos-sdk sets gas=0 and simulate=true
@@ -74,7 +74,7 @@ func TestAnteHandle(t *testing.T) {
 			RunPost:  false,
 			Simulate: false,
 			ExpPass:  false,
-			ExpErr:   sdkerrors.ErrInvalidGasLimit,
+			ExpErr:   sdkerrors.ErrOutOfGas,
 		},
 		{
 			Name: "signer has enough funds, should pass",
diff --git a/x/feemarket/ante/suite/suite.go b/x/feemarket/ante/suite/suite.go
index 9aa013c..daf9371 100644
--- a/x/feemarket/ante/suite/suite.go
+++ b/x/feemarket/ante/suite/suite.go
@@ -106,6 +106,10 @@ func (s *TestSuite) SetupHandlers(mock bool) {
 		authante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		feemarketante.NewFeeMarketCheckDecorator( // fee market replaces fee deduct decorator
 			s.FeeMarketKeeper,
+			s.AccountKeeper,
+			s.BankKeeper,
+			s.FeeGrantKeeper,
+			nil,
 		),
 		authante.NewSigGasConsumeDecorator(s.AccountKeeper, authante.DefaultSigVerificationGasConsumer),
 	}
diff --git a/x/feemarket/post/fee.go b/x/feemarket/post/fee.go
index 0cb84e2..2997579 100644
--- a/x/feemarket/post/fee.go
+++ b/x/feemarket/post/fee.go
@@ -223,7 +223,7 @@ func DeductCoins(bankKeeper BankKeeper, ctx sdk.Context, acc sdk.AccountI, coins
 
 	err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), targetModuleAcc, coins)
 	if err != nil {
-		return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())
+		return err
 	}
 
 	return nil
@@ -237,7 +237,7 @@ func SendTip(bankKeeper BankKeeper, ctx sdk.Context, acc, proposer sdk.AccAddres
 
 	err := bankKeeper.SendCoins(ctx, acc, proposer, coins)
 	if err != nil {
-		return errorsmod.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())
+		return err
 	}
 
 	return nil