Skip to content

Commit

Permalink
commit wip fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
MalteHerrmann committed Aug 19, 2024
1 parent 013edbf commit 774ac37
Show file tree
Hide file tree
Showing 31 changed files with 177 additions and 158 deletions.
19 changes: 10 additions & 9 deletions ante/evm/04_validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ethereum/go-ethereum/common"
"github.com/evmos/os/ante/evm"
"github.com/evmos/os/testutil"
testkeyring "github.com/evmos/os/testutil/integration/os/keyring"
evmtypes "github.com/evmos/os/x/evm/types"
)
Expand All @@ -32,7 +33,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
expectedError: errortypes.ErrInvalidRequest,
getFunctionParams: func() validateMsgParams {
return validateMsgParams{
evmParams: evmtypes.DefaultParams(),
evmParams: evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom),
txData: nil,
from: keyring.GetAccAddr(0),
}
Expand All @@ -46,7 +47,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)
return validateMsgParams{
evmParams: evmtypes.DefaultParams(),
evmParams: evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom),
txData: txData,
from: nil,
}
Expand All @@ -60,7 +61,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)

params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
params.AccessControl.Call.AccessType = evmtypes.AccessTypeRestricted
params.AccessControl.Create.AccessType = evmtypes.AccessTypeRestricted

Expand All @@ -79,7 +80,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)
return validateMsgParams{
evmParams: evmtypes.DefaultParams(),
evmParams: evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom),
txData: txData,
from: nil,
}
Expand All @@ -93,7 +94,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)

params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
params.AccessControl.Create.AccessType = evmtypes.AccessTypeRestricted

return validateMsgParams{
Expand All @@ -111,7 +112,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)

params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
params.AccessControl.Call.AccessType = evmtypes.AccessTypeRestricted

return validateMsgParams{
Expand All @@ -129,7 +130,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)
return validateMsgParams{
evmParams: evmtypes.DefaultParams(),
evmParams: evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom),
txData: txData,
from: nil,
}
Expand All @@ -143,7 +144,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)

params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
params.AccessControl.Call.AccessType = evmtypes.AccessTypeRestricted

return validateMsgParams{
Expand All @@ -161,7 +162,7 @@ func (suite *EvmAnteTestSuite) TestValidateMsg() {
txData, err := txArgs.ToTxData()
suite.Require().NoError(err)

params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
params.AccessControl.Create.AccessType = evmtypes.AccessTypeRestricted

return validateMsgParams{
Expand Down
6 changes: 2 additions & 4 deletions ante/evm/fee_checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ func (m MockEVMKeeper) GetBaseFee(_ sdk.Context, _ *params.ChainConfig) *big.Int
}

func (m MockEVMKeeper) GetParams(_ sdk.Context) evmtypes.Params {
evmParams := evmtypes.DefaultParams()
evmParams.EvmDenom = testutil.ExampleAttoDenom // NOTE: it's important to set the evm denomination here

return evmParams
// NOTE: it's important to set the evm denomination here
return evmtypes.DefaultParamsWithEVMDenom(testutil.ExampleAttoDenom)
}

func (m MockEVMKeeper) ChainID() *big.Int {
Expand Down
2 changes: 1 addition & 1 deletion ante/evm/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (suite *AnteTestSuite) SetupTest() {
})

suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 2, ChainID: testutil.ExampleChainID, Time: time.Now().UTC()})
suite.ctx = suite.ctx.WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin(evmtypes.DefaultEVMDenom, sdkmath.OneInt())))
suite.ctx = suite.ctx.WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin(testutil.ExampleAttoDenom, sdkmath.OneInt())))
suite.ctx = suite.ctx.WithBlockGasMeter(storetypes.NewGasMeter(1000000000000000000))

// set staking denomination to Evmos denom
Expand Down
32 changes: 16 additions & 16 deletions ante/evm/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"time"

"cosmossdk.io/math"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -36,6 +35,7 @@ import (
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/evmos/os/crypto/ethsecp256k1"
"github.com/evmos/os/ethereum/eip712"
"github.com/evmos/os/testutil"
utiltx "github.com/evmos/os/testutil/tx"
evmtypes "github.com/evmos/os/x/evm/types"
)
Expand Down Expand Up @@ -114,7 +114,7 @@ func (suite *AnteTestSuite) CreateTestTxBuilder(
txData, err := evmtypes.UnpackTxData(msg.Data)
suite.Require().NoError(err)

fees := sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewIntFromBigInt(txData.Fee())))
fees := sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewIntFromBigInt(txData.Fee())))
builder.SetFeeAmount(fees)
builder.SetGasLimit(msg.GetGas())

Expand Down Expand Up @@ -190,15 +190,15 @@ func (suite *AnteTestSuite) CreateTestCosmosTxBuilder(gasPrice math.Int, denom s
func (suite *AnteTestSuite) CreateTestEIP712TxBuilderMsgSend(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
// Build MsgSend
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))
return suite.CreateTestEIP712SingleMessageTxBuilder(priv, chainID, gas, gasAmount, msgSend)
}

func (suite *AnteTestSuite) CreateTestEIP712TxBuilderMsgDelegate(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
// Build MsgSend
valEthAddr := utiltx.GenerateAddress()
valAddr := sdk.ValAddress(valEthAddr.Bytes())
msgSend := stakingtypes.NewMsgDelegate(from, valAddr, sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(20)))
msgSend := stakingtypes.NewMsgDelegate(from, valAddr, sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(20)))
return suite.CreateTestEIP712SingleMessageTxBuilder(priv, chainID, gas, gasAmount, msgSend)
}

Expand All @@ -209,7 +209,7 @@ func (suite *AnteTestSuite) CreateTestEIP712MsgCreateValidator(from sdk.AccAddre
msgCreate, err := stakingtypes.NewMsgCreateValidator(
valAddr,
privEd.PubKey(),
sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(20)),
sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(20)),
stakingtypes.NewDescription("moniker", "identity", "website", "security_contract", "details"),
stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()),
math.OneInt(),
Expand All @@ -225,7 +225,7 @@ func (suite *AnteTestSuite) CreateTestEIP712MsgCreateValidator2(from sdk.AccAddr
msgCreate, err := stakingtypes.NewMsgCreateValidator(
valAddr,
privEd.PubKey(),
sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(20)),
sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(20)),
// Ensure optional fields can be left blank
stakingtypes.NewDescription("moniker", "identity", "", "", ""),
stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()),
Expand All @@ -244,7 +244,7 @@ func (suite *AnteTestSuite) CreateTestEIP712SubmitProposal(from sdk.AccAddress,
}

func (suite *AnteTestSuite) CreateTestEIP712GrantAllowance(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
spendLimit := sdk.NewCoins(sdk.NewInt64Coin(evmtypes.DefaultEVMDenom, 10))
spendLimit := sdk.NewCoins(sdk.NewInt64Coin(testutil.ExampleAttoDenom, 10))
threeHours := time.Now().Add(3 * time.Hour)
basic := &feegrant.BasicAllowance{
SpendLimit: spendLimit,
Expand Down Expand Up @@ -315,7 +315,7 @@ func (suite *AnteTestSuite) CreateTestEIP712SubmitProposalV1(from sdk.AccAddress
// Build V1 proposal
msgProposal, err := govtypesv1.NewMsgSubmitProposal(
proposalMsgs,
sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(100))),
sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(100))),
sdk.MustBech32ifyAddressBytes(sdk.GetConfig().GetBech32AccountAddrPrefix(), from.Bytes()),
"Metadata", "title", "summary",
)
Expand All @@ -327,26 +327,26 @@ func (suite *AnteTestSuite) CreateTestEIP712SubmitProposalV1(from sdk.AccAddress

func (suite *AnteTestSuite) CreateTestEIP712MsgExec(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))
msgExec := authz.NewMsgExec(from, []sdk.Msg{msgSend})
return suite.CreateTestEIP712SingleMessageTxBuilder(priv, chainID, gas, gasAmount, &msgExec)
}

func (suite *AnteTestSuite) CreateTestEIP712MultipleMsgSend(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))
return suite.CreateTestEIP712CosmosTxBuilder(priv, chainID, gas, gasAmount, []sdk.Msg{msgSend, msgSend, msgSend})
}

func (suite *AnteTestSuite) CreateTestEIP712MultipleDifferentMsgs(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))

msgVote := govtypesv1.NewMsgVote(from, 1, govtypesv1.VoteOption_VOTE_OPTION_YES, "")

valEthAddr := utiltx.GenerateAddress()
valAddr := sdk.ValAddress(valEthAddr.Bytes())
msgDelegate := stakingtypes.NewMsgDelegate(from, valAddr, sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(20)))
msgDelegate := stakingtypes.NewMsgDelegate(from, valAddr, sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(20)))

return suite.CreateTestEIP712CosmosTxBuilder(priv, chainID, gas, gasAmount, []sdk.Msg{msgSend, msgVote, msgDelegate})
}
Expand Down Expand Up @@ -382,14 +382,14 @@ func (suite *AnteTestSuite) CreateTestEIP712MsgTransferWithoutMemo(from sdk.AccA

func (suite *AnteTestSuite) createMsgTransfer(from sdk.AccAddress, memo string) *ibctypes.MsgTransfer {
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgTransfer := ibctypes.NewMsgTransfer("transfer", "channel-25", sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(100000)), from.String(), recipient.String(), ibcclienttypes.NewHeight(1000, 1000), 1000, memo)
msgTransfer := ibctypes.NewMsgTransfer("transfer", "channel-25", sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(100000)), from.String(), recipient.String(), ibcclienttypes.NewHeight(1000, 1000), 1000, memo)
return msgTransfer
}

func (suite *AnteTestSuite) CreateTestEIP712MultipleSignerMsgs(from sdk.AccAddress, priv cryptotypes.PrivKey, chainID string, gas uint64, gasAmount sdk.Coins) (client.TxBuilder, error) {
recipient := sdk.AccAddress(common.Address{}.Bytes())
msgSend1 := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend2 := banktypes.NewMsgSend(recipient, from, sdk.NewCoins(sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(1))))
msgSend1 := banktypes.NewMsgSend(from, recipient, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))
msgSend2 := banktypes.NewMsgSend(recipient, from, sdk.NewCoins(sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(1))))
return suite.CreateTestEIP712CosmosTxBuilder(priv, chainID, gas, gasAmount, []sdk.Msg{msgSend1, msgSend2})
}

Expand Down Expand Up @@ -572,7 +572,7 @@ func (suite *AnteTestSuite) createBaseTxBuilder(msg sdk.Msg, gas uint64) client.

txBuilder.SetGasLimit(gas)
txBuilder.SetFeeAmount(sdk.NewCoins(
sdk.NewCoin(evmtypes.DefaultEVMDenom, math.NewInt(10000)),
sdk.NewCoin(testutil.ExampleAttoDenom, math.NewInt(10000)),
))

err := txBuilder.SetMsgs(msg)
Expand Down
9 changes: 8 additions & 1 deletion example_chain/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,14 @@ func (app *ExampleChain) TxConfig() client.TxConfig {

// DefaultGenesis returns a default genesis from the registered AppModuleBasic's.
func (a *ExampleChain) DefaultGenesis() map[string]json.RawMessage {
return ModuleBasics.DefaultGenesis(a.appCodec)
genesis := ModuleBasics.DefaultGenesis(a.appCodec)

// NOTE: for the example chain implementation we need to set the default EVM denomination
evmGenState := evmtypes.DefaultGenesisState()
evmGenState.Params.EvmDenom = ExampleChainDenom
genesis[evmtypes.ModuleName] = a.appCodec.MustMarshalJSON(evmGenState)

return genesis
}

// GetKey returns the KVStoreKey for the provided store key.
Expand Down
3 changes: 3 additions & 0 deletions example_chain/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,13 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
Expand Down
46 changes: 3 additions & 43 deletions example_chain/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"cosmossdk.io/math"
dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
tmjson "github.com/cometbft/cometbft/libs/json"
"github.com/cometbft/cometbft/libs/log"
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
tmtypes "github.com/cometbft/cometbft/types"
Expand Down Expand Up @@ -53,49 +52,8 @@ func setup(withGenesis bool, invCheckPeriod uint, chainID string) (*ExampleChain
if withGenesis {
return app, app.DefaultGenesis()
}
return app, GenesisState{}
}

// NewSimappWithCustomOptions initializes a new ExampleChain with custom options.
func NewSimappWithCustomOptions(t *testing.T, isCheckTx bool, options SetupOptions) *ExampleChain {
t.Helper()

privVal := mock.NewPV()
pubKey, err := privVal.GetPubKey()
require.NoError(t, err)
// create validator set with single validator
validator := tmtypes.NewValidator(pubKey, 1)
valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator})

// generate genesis account
senderPrivKey := secp256k1.GenPrivKey()
acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
balance := banktypes.Balance{
Address: acc.GetAddress().String(),
Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))),
}

app := NewExampleApp(options.Logger, options.DB, nil, true, options.AppOpts)
genesisState := app.DefaultGenesis()
genesisState, err = simtestutil.GenesisStateWithValSet(app.AppCodec(), genesisState, valSet, []authtypes.GenesisAccount{acc}, balance)
require.NoError(t, err)

if !isCheckTx {
// init chain must be called to stop deliverState from being nil
stateBytes, err := tmjson.MarshalIndent(genesisState, "", " ")
require.NoError(t, err)

// Initialize the chain
app.InitChain(
abci.RequestInitChain{
Validators: []abci.ValidatorUpdate{},
ConsensusParams: simtestutil.DefaultConsensusParams,
AppStateBytes: stateBytes,
},
)
}

return app
return app, GenesisState{}
}

// Setup initializes a new ExampleChain. A Nop logger is set in ExampleChain.
Expand Down Expand Up @@ -143,12 +101,14 @@ func SetupWithGenesisValSet(t *testing.T, chainID string, valSet *tmtypes.Valida
Validators: []abci.ValidatorUpdate{},
ConsensusParams: simtestutil.DefaultConsensusParams,
AppStateBytes: stateBytes,
ChainId: chainID,
},
)

// commit genesis changes
app.Commit()
app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{
ChainID: chainID,
Height: app.LastBlockHeight() + 1,
AppHash: app.LastCommitID().Hash,
ValidatorsHash: valSet.Hash(),
Expand Down
2 changes: 1 addition & 1 deletion precompiles/p256/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var _ = Describe("Calling p256 precompile directly", Label("P256 Precompile"), O

When("the precompile is not enabled in the EVM params", func() {
BeforeEach(func() {
params := evmtypes.DefaultParams()
params := evmtypes.DefaultParamsWithEVMDenom(s.network.GetDenom())
addr := s.precompileAddress.String()
var activePrecompiles []string
for _, precompile := range params.ActiveStaticPrecompiles {
Expand Down
3 changes: 2 additions & 1 deletion rpc/backend/call_tx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/ethereum/go-ethereum/rlp"
"github.com/evmos/os/rpc/backend/mocks"
rpctypes "github.com/evmos/os/rpc/types"
"github.com/evmos/os/testutil"
utiltx "github.com/evmos/os/testutil/tx"
evmtypes "github.com/evmos/os/x/evm/types"
"google.golang.org/grpc/metadata"
Expand Down Expand Up @@ -295,7 +296,7 @@ func (suite *BackendTestSuite) TestSendRawTransaction() {
suite.Require().NoError(err)

rlpEncodedBz, _ := rlp.EncodeToBytes(ethTx.AsTransaction())
cosmosTx, _ := ethTx.BuildTx(suite.backend.clientCtx.TxConfig.NewTxBuilder(), evmtypes.DefaultEVMDenom)
cosmosTx, _ := ethTx.BuildTx(suite.backend.clientCtx.TxConfig.NewTxBuilder(), testutil.ExampleAttoDenom)
txBytes, _ := suite.backend.clientCtx.TxConfig.TxEncoder()(cosmosTx)

testCases := []struct {
Expand Down
Loading

0 comments on commit 774ac37

Please sign in to comment.