remove unused bank keeper dependency from account verification decora…

…tor (#1074) The account verification decorator uses the evm keeper methods which already use the bank keeper, leaving the dependency unused. Co-authored-by: Federico Kunze Küllmer <[email protected]>
evmos · May 2, 2022 · a4b8816 · a4b8816
1 parent 4ea9b6d
commit a4b8816
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/app/ante/eth.go b/app/ante/eth.go
@@ -68,17 +68,15 @@ func (esvd EthSigVerificationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, s
 
 // EthAccountVerificationDecorator validates an account balance checks
 type EthAccountVerificationDecorator struct {
-	ak         evmtypes.AccountKeeper
-	bankKeeper evmtypes.BankKeeper
-	evmKeeper  EVMKeeper
+	ak        evmtypes.AccountKeeper
+	evmKeeper EVMKeeper
 }
 
 // NewEthAccountVerificationDecorator creates a new EthAccountVerificationDecorator
-func NewEthAccountVerificationDecorator(ak evmtypes.AccountKeeper, bankKeeper evmtypes.BankKeeper, ek EVMKeeper) EthAccountVerificationDecorator {
+func NewEthAccountVerificationDecorator(ak evmtypes.AccountKeeper, ek EVMKeeper) EthAccountVerificationDecorator {
 	return EthAccountVerificationDecorator{
-		ak:         ak,
-		bankKeeper: bankKeeper,
-		evmKeeper:  ek,
+		ak:        ak,
+		evmKeeper: ek,
 	}
 }
 

diff --git a/app/ante/eth_test.go b/app/ante/eth_test.go
@@ -59,7 +59,7 @@ func (suite AnteTestSuite) TestEthSigVerificationDecorator() {
 
 func (suite AnteTestSuite) TestNewEthAccountVerificationDecorator() {
 	dec := ante.NewEthAccountVerificationDecorator(
-		suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.EvmKeeper,
+		suite.app.AccountKeeper, suite.app.EvmKeeper,
 	)
 
 	addr := tests.GenerateAddress()

diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go
@@ -53,7 +53,7 @@ func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
 		NewEthMempoolFeeDecorator(options.EvmKeeper),   // Check eth effective gas price against minimal-gas-prices
 		NewEthValidateBasicDecorator(options.EvmKeeper),
 		NewEthSigVerificationDecorator(options.EvmKeeper),
-		NewEthAccountVerificationDecorator(options.AccountKeeper, options.BankKeeper, options.EvmKeeper),
+		NewEthAccountVerificationDecorator(options.AccountKeeper, options.EvmKeeper),
 		NewEthGasConsumeDecorator(options.EvmKeeper, options.MaxTxGasWanted),
 		NewCanTransferDecorator(options.EvmKeeper),
 		NewEthIncrementSenderSequenceDecorator(options.AccountKeeper), // innermost AnteDecorator.