feat: match app.go with original code(cosmos-sdk v0.50.1)

b-harvest · Dec 5, 2023 · aa436e8 · aa436e8
1 parent 1d48007
commit aa436e8
Show file tree

Hide file tree

Showing 34 changed files with 536 additions and 446 deletions.
diff --git a/api/ethermint/evm/v1/tx.pulsar.go b/api/ethermint/evm/v1/tx.pulsar.go
diff --git a/api/ethermint/feemarket/v1/feemarket.pulsar.go b/api/ethermint/feemarket/v1/feemarket.pulsar.go
diff --git a/api/ethermint/feemarket/v1/tx.pulsar.go b/api/ethermint/feemarket/v1/tx.pulsar.go
diff --git a/app/ante/fee_checker_test.go b/app/ante/fee_checker_test.go
@@ -11,7 +11,6 @@ import (
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/evmos/ethermint/encoding"
@@ -52,7 +51,7 @@ func TestSDKTxFeeChecker(t *testing.T) {
 	//      with extension option
 	//      without extension option
 	//      london hardfork enableness
-	encodingConfig := encoding.MakeConfig(module.NewBasicManager())
+	encodingConfig := encoding.MakeTestEncodingConfig()
 	minGasPrices := sdk.NewDecCoins(sdk.NewDecCoin("aphoton", sdkmath.NewInt(10)))
 
 	genesisCtx := sdk.NewContext(nil, tmproto.Header{}, false, log.NewNopLogger())

diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go
@@ -53,7 +53,6 @@ import (
 	"cosmossdk.io/x/feegrant"
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
-	sdktestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
@@ -139,7 +138,7 @@ func (suite *AnteTestSuite) SetupTest() {
 	acc := suite.app.AccountKeeper.NewAccountWithAddress(suite.ctx, addr)
 	suite.app.AccountKeeper.SetAccount(suite.ctx, acc)
 
-	encodingConfig := encoding.MakeConfig(app.ModuleBasics)
+	encodingConfig := encoding.MakeTestEncodingConfig(auth.AppModuleBasic{}, authzmodule.AppModuleBasic{}, bank.AppModuleBasic{}, evidence.AppModuleBasic{}, evm.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, gov.AppModuleBasic{}, staking.AppModuleBasic{})
 	// We're using TestMsg amino encoding in some tests, so register it here.
 	encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
 	eip712.SetEncodingConfig(encodingConfig)
@@ -180,8 +179,7 @@ func (suite *AnteTestSuite) SetupTest() {
 	suite.ctx, err = testutil.Commit(suite.ctx, suite.app, time.Second*0, nil)
 	suite.Require().NoError(err)
 
-	encCfg := sdktestutil.MakeTestEncodingConfig(auth.AppModuleBasic{}, authzmodule.AppModuleBasic{}, bank.AppModuleBasic{}, evidence.AppModuleBasic{}, evm.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, gov.AppModuleBasic{}, staking.AppModuleBasic{})
-	legacytx.RegressionTestingAminoCodec = encCfg.Amino
+	legacytx.RegressionTestingAminoCodec = encodingConfig.Amino
 }
 
 func (s *AnteTestSuite) BuildTestEthTx(