refactor: replace unnecessary keeper dependencies from tests

evmd/tests/ibc/helper.go

@@ -83,7 +83,24 @@ func SetupNativeErc20(t *testing.T, chain *evmibctesting.TestChain, senderAcc ev
 	}
 
 	// Verify minted balance
-	bal := evmApp.GetErc20Keeper().BalanceOf(evmCtx, contractAbi, contractAddr, common.BytesToAddress(senderAddr))
+	ethRes, err := evmApp.GetEVMKeeper().CallEVM(
+		evmCtx,
+		contractAbi,
+		common.BytesToAddress(senderAddr),
+		contractAddr,
+		false,
+		nil,
+		"balanceOf",
+		common.BytesToAddress(senderAddr),
+	)
+	if err != nil {
+		t.Fatalf("balanceOf call failed: %v", err)
+	}
+	var bal *big.Int
+	err = contractAbi.UnpackIntoInterface(&bal, "balanceOf", ethRes.Ret)
+	if err != nil {
+		t.Fatalf("balanceOf call failed: %v", err)
+	}
 	if bal.Cmp(big.NewInt(sendAmt.Int64())) != 0 {
 		t.Fatalf("unexpected ERC20 balance; got %s, want %s", bal.String(), sendAmt.String())
 	}

evmd/tests/ibc/ics20_recursive_precompile_calls_test.go

@@ -205,7 +205,19 @@ func (suite *ICS20RecursivePrecompileCallsTestSuite) setupContractForTesting(
 	suite.chainA.NextBlock()
 
 	// Verify minted balance
-	bal := evmAppA.GetErc20Keeper().BalanceOf(ctxA, contractData.ABI, contractAddr, common.BytesToAddress(senderAddr))
+	ethRes, err := evmAppA.GetEVMKeeper().CallEVM(
+		ctxA,
+		contractData.ABI,
+		common.BytesToAddress(senderAddr),
+		contractAddr,
+		false,
+		nil,
+		"balanceOf",
+		common.BytesToAddress(senderAddr),
+	)
+	var bal *big.Int
+	err = contractData.ABI.UnpackIntoInterface(&bal, "balanceOf", ethRes.Ret)
+	suite.Require().NoError(err)
 	suite.Require().Equal(big.NewInt(InitialTokenAmount), bal, "unexpected ERC20 balance")
 }
 

interfaces.go

@@ -194,7 +194,6 @@ type (
 	}
 	GovPrecompileApp interface {
 		TestApp
-		FeeMarketKeeperProvider // Should be removed after refactoring test code
 		GovKeeperProvider
 	}
 	ICS20PrecompileApp interface {
@@ -217,7 +216,6 @@ type (
 		TestApp
 		AccountKeeperProvider
 		BankKeeperProvider
-		Erc20KeeperProvider // Should be removed after refactoring test code
 		StakingKeeperProvider
 	}
 	WERC20PrecompileApp interface {

tests/integration/precompiles/gov/test_integration.go

@@ -264,9 +264,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			It("cancels a proposal and see cancellation fee charged", func() {
 				// Fix the gas limit and gas price for predictable gas usage.
 				// This is for calculating expected cancellation fee.
-				baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-				baseFeeInt := baseFee.TruncateInt64()
-				txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+				baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+				txArgs.GasPrice = baseFee
 				txArgs.GasLimit = 500_000
 
 				// Get the prposal for cancellation
@@ -1248,9 +1247,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas price for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 
 					// Prepare the proposal
@@ -1406,9 +1404,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas price for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 
 					// Prepare the proposal
@@ -1502,9 +1499,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas price for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 					txArgs.Amount = big.NewInt(300)
 
@@ -1692,9 +1688,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas ice for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 					txArgs.Amount = big.NewInt(100)
 
@@ -1925,9 +1920,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas ice for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 					txArgs.Amount = big.NewInt(100)
 
@@ -2076,9 +2070,8 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				func(tc testCase) {
 					// Fix the gas limit and gas price for predictable gas usage.
 					// This is for calculating expected cancellation fee.
-					baseFee := s.network.App.GetFeeMarketKeeper().GetBaseFee(s.network.GetContext())
-					baseFeeInt := baseFee.TruncateInt64()
-					txArgs.GasPrice = new(big.Int).SetInt64(baseFeeInt)
+					baseFee := s.network.App.GetEVMKeeper().GetBaseFee(s.network.GetContext())
+					txArgs.GasPrice = baseFee
 					txArgs.GasLimit = 500_000
 					txArgs.Amount = big.NewInt(100)
 					randomAddr := testutiltx.GenerateAddress()

tests/integration/precompiles/staking/test_integration.go

@@ -3374,7 +3374,21 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 			Expect(s.network.NextBlock()).To(BeNil())
 
 			// Check that the StakingCaller contract has the correct balance
-			erc20Balance := s.network.App.GetErc20Keeper().BalanceOf(s.network.GetContext(), erc20Contract.ABI, erc20ContractAddr, contractAddr)
+			ethRes, err := s.factory.QueryContract(
+				evmtypes.EvmTxArgs{
+					To: &erc20ContractAddr,
+				},
+				testutiltypes.CallArgs{
+					ContractABI: erc20Contract.ABI,
+					MethodName:  "balanceOf",
+					Args:        []interface{}{contractAddr},
+				},
+				0,
+			)
+			Expect(err).To(BeNil(), "error while querying the ERC20 balance of the StakingCaller contract")
+			var erc20Balance *big.Int
+			err = erc20Contract.ABI.UnpackIntoInterface(&erc20Balance, "balanceOf", ethRes.Ret)
+			Expect(err).To(BeNil(), "error while unpacking the ERC20 balance result")
 			Expect(erc20Balance).To(Equal(mintAmount), "expected different ERC20 balance for the StakingCaller contract")
 
 			// populate default call args
@@ -3457,9 +3471,23 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				Expect(res.DelegationResponse).NotTo(BeNil())
 				delegationPost := res.DelegationResponse.Delegation
 				sharesPost := delegationPost.GetShares()
-				erc20BalancePost := s.network.App.GetErc20Keeper().BalanceOf(s.network.GetContext(), erc20Contract.ABI, erc20ContractAddr, delegator.Addr)
-
 				Expect(sharesPost).To(Equal(sharesPre), "expected shares to be equal when reverting state")
+
+				var erc20BalancePost *big.Int
+				ethRes, err := s.factory.QueryContract(
+					evmtypes.EvmTxArgs{
+						To: &erc20ContractAddr,
+					},
+					testutiltypes.CallArgs{
+						ContractABI: erc20Contract.ABI,
+						MethodName:  "balanceOf",
+						Args:        []interface{}{delegator.Addr},
+					},
+					0,
+				)
+				Expect(err).To(BeNil(), "error while querying the ERC20 balance of delegator")
+				err = erc20Contract.ABI.UnpackIntoInterface(&erc20BalancePost, "balanceOf", ethRes.Ret)
+				Expect(err).To(BeNil(), "error while unpacking the ERC20 balance result")
 				Expect(erc20BalancePost.Int64()).To(BeZero(), "expected erc20 balance of target address to be zero when reverting state")
 			})
 
@@ -3490,9 +3518,23 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				Expect(res.DelegationResponse).NotTo(BeNil())
 				delegationPost := res.DelegationResponse.Delegation
 				sharesPost := delegationPost.GetShares()
-				erc20BalancePost := s.network.App.GetErc20Keeper().BalanceOf(s.network.GetContext(), erc20Contract.ABI, erc20ContractAddr, delegator.Addr)
-
 				Expect(sharesPost).To(Equal(sharesPre), "expected shares to be equal when reverting state")
+
+				ethRes, err := s.factory.QueryContract(
+					evmtypes.EvmTxArgs{
+						To: &erc20ContractAddr,
+					},
+					testutiltypes.CallArgs{
+						ContractABI: erc20Contract.ABI,
+						MethodName:  "balanceOf",
+						Args:        []interface{}{delegator.Addr},
+					},
+					0,
+				)
+				Expect(err).To(BeNil(), "error while querying the ERC20 balance of delegator")
+				var erc20BalancePost *big.Int
+				err = erc20Contract.ABI.UnpackIntoInterface(&erc20BalancePost, "balanceOf", ethRes.Ret)
+				Expect(err).To(BeNil(), "error while unpacking the ERC20 balance result")
 				Expect(erc20BalancePost.Int64()).To(BeZero(), "expected erc20 balance of target address to be zero when reverting state")
 			})
 
@@ -3538,9 +3580,23 @@ func TestPrecompileIntegrationTestSuite(t *testing.T, create network.CreateEvmAp
 				)
 				delegationPost := res.DelegationResponse.Delegation
 				sharesPost := delegationPost.GetShares()
-				erc20BalancePost := s.network.App.GetErc20Keeper().BalanceOf(s.network.GetContext(), erc20Contract.ABI, erc20ContractAddr, delegator.Addr)
-
 				Expect(sharesPost.GT(sharesPre)).To(BeTrue(), "expected shares to be more than before")
+
+				ethRes, err := s.factory.QueryContract(
+					evmtypes.EvmTxArgs{
+						To: &erc20ContractAddr,
+					},
+					testutiltypes.CallArgs{
+						ContractABI: erc20Contract.ABI,
+						MethodName:  "balanceOf",
+						Args:        []interface{}{delegator.Addr},
+					},
+					0,
+				)
+				Expect(err).To(BeNil(), "error while querying the ERC20 balance of delegator")
+				var erc20BalancePost *big.Int
+				err = erc20Contract.ABI.UnpackIntoInterface(&erc20BalancePost, "balanceOf", ethRes.Ret)
+				Expect(err).To(BeNil(), "error while unpacking the ERC20 balance result")
 				Expect(erc20BalancePost).To(Equal(transferredAmount), "expected different erc20 balance of target address")
 			})
 		})

tests/integration/x/vm/test_fees.go

@@ -511,11 +511,11 @@ func (s *KeeperTestSuite) TestVerifyFeeAndDeductTxCostsFromUserBalance() {
 			if tc.expectPassVerify {
 				s.Require().NoError(err, "valid test %d failed - '%s'", i, tc.name)
 				if tc.EnableFeemarket {
-					baseFee := s.Network.App.GetFeeMarketKeeper().GetBaseFee(s.Network.GetContext())
+					baseFee := s.Network.App.GetEVMKeeper().GetBaseFee(s.Network.GetContext())
 					s.Require().Equal(
 						fees,
 						sdk.NewCoins(
-							sdk.NewCoin(baseDenom, sdkmath.NewIntFromBigInt(tx.GetEffectiveFee(baseFee.TruncateInt().BigInt()))),
+							sdk.NewCoin(baseDenom, sdkmath.NewIntFromBigInt(tx.GetEffectiveFee(baseFee))),
 						),
 						"valid test %d failed, fee value is wrong  - '%s'", i, tc.name,
 					)