From 22623a4090848dbfc3ad55b733e076734f186c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?= <31522760+fedekunze@users.noreply.github.com> Date: Thu, 2 Sep 2021 10:42:55 +0200 Subject: [PATCH] evm: fix keeper tests (#516) * evm: fix keeper tests * rm func * fix --- x/evm/keeper/keeper_test.go | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index 9fb0f4e5..aa177977 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -14,11 +14,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/tharsis/ethermint/app" @@ -150,13 +147,6 @@ func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { suite.clientCtx = client.Context{}.WithTxConfig(encodingConfig.TxConfig) suite.ethSigner = ethtypes.LatestSignerForChainID(suite.app.EvmKeeper.ChainID()) suite.appCodec = encodingConfig.Marshaler - - // mint some tokens to coinbase address - _, bankKeeper := suite.initKeepersWithmAccPerms() - require.NoError(t, err) - initCoin := sdk.NewCoins(sdk.NewCoin(suite.EvmDenom(), testTokens)) - err = simapp.FundAccount(bankKeeper, suite.ctx, acc.GetAddress(), initCoin) - require.NoError(t, err) } func (suite *KeeperTestSuite) SetupTest() { @@ -187,24 +177,6 @@ func (suite *KeeperTestSuite) Commit() { suite.queryClient = types.NewQueryClient(queryHelper) } -// initKeepersWithmAccPerms construct a bank keeper that can mint tokens out of thin air -func (suite *KeeperTestSuite) initKeepersWithmAccPerms() (authkeeper.AccountKeeper, bankkeeper.BaseKeeper) { - maccPerms := app.GetMaccPerms() - - maccPerms[authtypes.Burner] = []string{authtypes.Burner} - maccPerms[authtypes.Minter] = []string{authtypes.Minter} - authKeeper := authkeeper.NewAccountKeeper( - suite.appCodec, suite.app.GetKey(types.StoreKey), suite.app.GetSubspace(types.ModuleName), - authtypes.ProtoBaseAccount, maccPerms, - ) - keeper := bankkeeper.NewBaseKeeper( - suite.appCodec, suite.app.GetKey(types.StoreKey), authKeeper, - suite.app.GetSubspace(types.ModuleName), map[string]bool{}, - ) - - return authKeeper, keeper -} - // DeployTestContract deploy a test erc20 contract and returns the contract address func (suite *KeeperTestSuite) DeployTestContract(t require.TestingT, owner common.Address, supply *big.Int) common.Address { ctx := sdk.WrapSDKContext(suite.ctx)