fix tests

evmos · Aug 21, 2024 · c167e7e · c167e7e
1 parent 7642c13
commit c167e7e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/x/evm/keeper/config.go b/x/evm/keeper/config.go
@@ -1,5 +1,6 @@
 // Copyright Tharsis Labs Ltd.(Evmos)
 // SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/evmos/blob/main/LICENSE)
+
 package keeper
 
 import (

diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go
@@ -3,6 +3,7 @@ package keeper_test
 import (
 	"encoding/json"
 	"fmt"
+	example_app "github.com/evmos/os/example_chain"
 	"math/big"
 
 	sdkmath "cosmossdk.io/math"
@@ -28,10 +29,10 @@ import (
 const invalidAddress = "0x0000"
 
 // expGasConsumed is the gas consumed in traceTx setup (GetProposerAddr + CalculateBaseFee)
-const expGasConsumed = 6422
+const expGasConsumed = 7346
 
 // expGasConsumedWithFeeMkt is the gas consumed in traceTx setup (GetProposerAddr + CalculateBaseFee) with enabled feemarket
-const expGasConsumedWithFeeMkt = 6416
+const expGasConsumedWithFeeMkt = 7340
 
 func (suite *KeeperTestSuite) TestQueryAccount() {
 	var (
@@ -411,7 +412,10 @@ func (suite *KeeperTestSuite) TestQueryTxLogs() {
 
 func (suite *KeeperTestSuite) TestQueryParams() {
 	ctx := sdk.WrapSDKContext(suite.ctx)
-	expParams := types.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
+
+	// NOTE: we are using the EVM genesis state for the example app here, because
+	// we have different assumptions for the evmOS offering and the example chain.
+	expParams := example_app.NewEVMGenesisState().Params
 
 	res, err := suite.queryClient.Params(ctx, &types.QueryParamsRequest{})
 	suite.Require().NoError(err)
@@ -955,7 +959,7 @@ func (suite *KeeperTestSuite) TestTraceTx() {
 			},
 			expPass:       true,
 			traceResponse: "{\"gas\":34828,\"failed\":false,\"returnValue\":\"0000000000000000000000000000000000000000000000000000000000000001\",\"structLogs\":[{\"pc\":0,\"op\":\"PUSH1\",\"gas\":",
-			expFinalGas:   14735, // gas consumed in traceTx setup (GetProposerAddr + CalculateBaseFee) + gas consumed in malleate func
+			expFinalGas:   25823, // gas consumed in traceTx setup (GetProposerAddr + CalculateBaseFee) + gas consumed in malleate func
 		},
 		{
 			msg: "invalid chain id",

diff --git a/x/evm/keeper/params_test.go b/x/evm/keeper/params_test.go
@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	example_app "github.com/evmos/os/example_chain"
 	"reflect"
 
 	"github.com/evmos/os/testutil"
@@ -19,7 +20,9 @@ func (suite *KeeperTestSuite) TestParams() {
 		{
 			"success - Checks if the default params are set correctly",
 			func() interface{} {
-				return types.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
+				// NOTE: we are using the EVM genesis state for the example app here, because
+				// we have different assumptions for the evmOS offering and the example chain.
+				return example_app.NewEVMGenesisState().Params
 			},
 			func() interface{} {
 				return suite.app.EVMKeeper.GetParams(suite.ctx)

diff --git a/x/evm/keeper/state_transition_test.go b/x/evm/keeper/state_transition_test.go
@@ -2,6 +2,7 @@ package keeper_test
 
 import (
 	"fmt"
+	example_app "github.com/evmos/os/example_chain"
 	"math"
 	"math/big"
 
@@ -521,14 +522,18 @@ func (suite *KeeperTestSuite) TestResetGasMeterAndConsumeGas() {
 
 func (suite *KeeperTestSuite) TestEVMConfig() {
 	proposerAddress := suite.ctx.BlockHeader().ProposerAddress
-	cfg, err := suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(9000))
+	cfg, err := suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(testutil.ExampleEIP155ChainID))
 	suite.Require().NoError(err)
-	defaultParams := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
+
+	// NOTE: since we are using different defaults for the app and the evmOS in general, we are getting the
+	// default parameters from the EVM genesis state for the example app here.
+	defaultParams := example_app.NewEVMGenesisState().Params
 	suite.Require().Equal(defaultParams, cfg.Params)
+
 	// london hardfork is enabled by default
 	suite.Require().Equal(big.NewInt(0), cfg.BaseFee)
 	suite.Require().Equal(suite.address, cfg.CoinBase)
-	suite.Require().Equal(defaultParams.ChainConfig.EthereumConfig(big.NewInt(9000)), cfg.ChainConfig)
+	suite.Require().Equal(defaultParams.ChainConfig.EthereumConfig(big.NewInt(testutil.ExampleEIP155ChainID)), cfg.ChainConfig)
 }
 
 func (suite *KeeperTestSuite) TestContractDeployment() {
@@ -542,7 +547,7 @@ func (suite *KeeperTestSuite) TestApplyMessage() {
 	var msg core.Message
 
 	proposerAddress := suite.ctx.BlockHeader().ProposerAddress
-	config, err := suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(9000))
+	config, err := suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(testutil.ExampleEIP155ChainID))
 	suite.Require().NoError(err)
 
 	keeperParams := suite.app.EVMKeeper.GetParams(suite.ctx)
@@ -678,7 +683,7 @@ func (suite *KeeperTestSuite) TestApplyMessageWithConfig() {
 			expectedGasUsed = params.TxGas
 
 			proposerAddress := suite.ctx.BlockHeader().ProposerAddress
-			config, err = suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(9000))
+			config, err = suite.app.EVMKeeper.EVMConfig(suite.ctx, proposerAddress, big.NewInt(testutil.ExampleEIP155ChainID))
 			suite.Require().NoError(err)
 
 			keeperParams = suite.app.EVMKeeper.GetParams(suite.ctx)