diff --git a/simapp/app.go b/simapp/app.go index 5408bcfe91..f6ee169484 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -11,7 +11,7 @@ import ( bam "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" @@ -126,9 +126,8 @@ func NewSimApp( ) *SimApp { // TODO: Remove cdc in favor of appCodec once all modules are migrated. - cdc := simappcodec.MakeCodec(ModuleBasics) - - appCodec := simappcodec.NewAppCodec(cdc) + cdc := codecstd.MakeCodec(ModuleBasics) + appCodec := codecstd.NewAppCodec(cdc) bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) diff --git a/simapp/genesis.go b/simapp/genesis.go index 1a760e3e49..c7432aab1f 100644 --- a/simapp/genesis.go +++ b/simapp/genesis.go @@ -3,7 +3,7 @@ package simapp import ( "encoding/json" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" ) // The genesis state of the blockchain is represented here as a map of raw json @@ -17,7 +17,6 @@ type GenesisState map[string]json.RawMessage // NewDefaultGenesisState generates the default state for the application. func NewDefaultGenesisState() GenesisState { - cdc := simappcodec.MakeCodec(ModuleBasics) - + cdc := codecstd.MakeCodec(ModuleBasics) return ModuleBasics.DefaultGenesis(cdc) } diff --git a/simapp/utils_test.go b/simapp/utils_test.go index b6d5fa1f35..710c2b9d48 100644 --- a/simapp/utils_test.go +++ b/simapp/utils_test.go @@ -8,13 +8,13 @@ import ( tmkv "github.com/tendermint/tendermint/libs/kv" "github.com/cosmos/cosmos-sdk/codec" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" ) func TestGetSimulationLog(t *testing.T) { - cdc := simappcodec.MakeCodec(ModuleBasics) + cdc := codecstd.MakeCodec(ModuleBasics) decoders := make(sdk.StoreDecoderRegistry) decoders[auth.StoreKey] = func(cdc *codec.Codec, kvAs, kvBs tmkv.Pair) string { return "10" } diff --git a/x/auth/types/common_test.go b/x/auth/types/common_test.go index 02b80ac6aa..70214acb37 100644 --- a/x/auth/types/common_test.go +++ b/x/auth/types/common_test.go @@ -1,11 +1,11 @@ package types_test import ( + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" ) var ( app = simapp.Setup(false) - appCodec = simappcodec.NewAppCodec(app.Codec()) + appCodec = codecstd.NewAppCodec(app.Codec()) ) diff --git a/x/auth/vesting/types/common_test.go b/x/auth/vesting/types/common_test.go index 02b80ac6aa..70214acb37 100644 --- a/x/auth/vesting/types/common_test.go +++ b/x/auth/vesting/types/common_test.go @@ -1,11 +1,11 @@ package types_test import ( + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" ) var ( app = simapp.Setup(false) - appCodec = simappcodec.NewAppCodec(app.Codec()) + appCodec = codecstd.NewAppCodec(app.Codec()) ) diff --git a/x/evidence/handler_test.go b/x/evidence/handler_test.go index 60e883364a..9f7cc11918 100644 --- a/x/evidence/handler_test.go +++ b/x/evidence/handler_test.go @@ -10,8 +10,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/ed25519" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/evidence/exported" @@ -25,8 +25,8 @@ type HandlerTestSuite struct { app *simapp.SimApp } -func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) simappcodec.MsgSubmitEvidence { - msg, err := simappcodec.NewMsgSubmitEvidence(e, s) +func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence { + msg, err := codecstd.NewMsgSubmitEvidence(e, s) r.NoError(err) return msg } @@ -55,7 +55,7 @@ func (suite *HandlerTestSuite) SetupTest() { // recreate keeper in order to use custom testing types evidenceKeeper := evidence.NewKeeper( - simappcodec.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), + codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper, ) router := evidence.NewRouter() @@ -118,7 +118,7 @@ func (suite *HandlerTestSuite) TestMsgSubmitEvidence() { suite.Require().NoError(err, "unexpected error; tc #%d", i) suite.Require().NotNil(res, "expected non-nil result; tc #%d", i) - msg := tc.msg.(simappcodec.MsgSubmitEvidence) + msg := tc.msg.(codecstd.MsgSubmitEvidence) suite.Require().Equal(msg.GetEvidence().Hash().Bytes(), res.Data, "invalid hash; tc #%d", i) } } diff --git a/x/evidence/keeper/keeper_test.go b/x/evidence/keeper/keeper_test.go index a28f66efea..49a2b39bef 100644 --- a/x/evidence/keeper/keeper_test.go +++ b/x/evidence/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/evidence" @@ -83,7 +83,7 @@ func (suite *KeeperTestSuite) SetupTest() { // recreate keeper in order to use custom testing types evidenceKeeper := evidence.NewKeeper( - simappcodec.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), + codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper, ) router := evidence.NewRouter() diff --git a/x/evidence/keeper/querier_test.go b/x/evidence/keeper/querier_test.go index 069f41c6ce..9b99fd4a8c 100644 --- a/x/evidence/keeper/querier_test.go +++ b/x/evidence/keeper/querier_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "strings" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/types" @@ -17,7 +17,7 @@ const ( func (suite *KeeperTestSuite) TestQueryEvidence_Existing() { ctx := suite.ctx.WithIsCheckTx(false) numEvidence := 100 - cdc := simappcodec.NewAppCodec(suite.app.Codec()) + cdc := codecstd.NewAppCodec(suite.app.Codec()) evidence := suite.populateEvidence(ctx, numEvidence) query := abci.RequestQuery{ @@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_Existing() { func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() { ctx := suite.ctx.WithIsCheckTx(false) - cdc := simappcodec.NewAppCodec(suite.app.Codec()) + cdc := codecstd.NewAppCodec(suite.app.Codec()) numEvidence := 100 suite.populateEvidence(ctx, numEvidence) @@ -52,7 +52,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() { func (suite *KeeperTestSuite) TestQueryAllEvidence() { ctx := suite.ctx.WithIsCheckTx(false) - cdc := simappcodec.NewAppCodec(suite.app.Codec()) + cdc := codecstd.NewAppCodec(suite.app.Codec()) numEvidence := 100 suite.populateEvidence(ctx, numEvidence) @@ -72,7 +72,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() { func (suite *KeeperTestSuite) TestQueryAllEvidence_InvalidPagination() { ctx := suite.ctx.WithIsCheckTx(false) - cdc := simappcodec.NewAppCodec(suite.app.Codec()) + cdc := codecstd.NewAppCodec(suite.app.Codec()) numEvidence := 100 suite.populateEvidence(ctx, numEvidence) diff --git a/x/evidence/types/codec_test.go b/x/evidence/types/codec_test.go index af2656d38c..cfe2a64831 100644 --- a/x/evidence/types/codec_test.go +++ b/x/evidence/types/codec_test.go @@ -7,15 +7,15 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" "github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/types" ) func TestCodec(t *testing.T) { app := simapp.Setup(false) - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) pk := ed25519.GenPrivKey() var e exported.Evidence = &types.Equivocation{ diff --git a/x/evidence/types/msgs_test.go b/x/evidence/types/msgs_test.go index 127df25357..73d4ef67ea 100644 --- a/x/evidence/types/msgs_test.go +++ b/x/evidence/types/msgs_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/types" @@ -13,8 +13,8 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" ) -func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) simappcodec.MsgSubmitEvidence { - msg, err := simappcodec.NewMsgSubmitEvidence(e, s) +func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence { + msg, err := codecstd.NewMsgSubmitEvidence(e, s) require.NoError(t, err) return msg } diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index c82019be77..4774f45084 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/staking" @@ -28,7 +28,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) { require.False(t, inactiveQueue.Valid()) inactiveQueue.Close() - newProposalMsg, err := simappcodec.NewMsgSubmitProposal( + newProposalMsg, err := codecstd.NewMsgSubmitProposal( gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0], @@ -80,7 +80,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { require.False(t, inactiveQueue.Valid()) inactiveQueue.Close() - newProposalMsg, err := simappcodec.NewMsgSubmitProposal( + newProposalMsg, err := codecstd.NewMsgSubmitProposal( gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0], @@ -103,7 +103,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { require.False(t, inactiveQueue.Valid()) inactiveQueue.Close() - newProposalMsg2, err := simappcodec.NewMsgSubmitProposal( + newProposalMsg2, err := codecstd.NewMsgSubmitProposal( gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0], @@ -160,7 +160,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { require.False(t, activeQueue.Valid()) activeQueue.Close() - newProposalMsg, err := simappcodec.NewMsgSubmitProposal( + newProposalMsg, err := codecstd.NewMsgSubmitProposal( gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0], @@ -216,7 +216,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { activeQueue.Close() proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))} - newProposalMsg, err := simappcodec.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0]) + newProposalMsg, err := codecstd.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0]) require.NoError(t, err) res, err := govHandler(ctx, newProposalMsg) diff --git a/x/gov/keeper/common_test.go b/x/gov/keeper/common_test.go index e7e9747a07..a61171e246 100644 --- a/x/gov/keeper/common_test.go +++ b/x/gov/keeper/common_test.go @@ -1,8 +1,8 @@ package keeper_test import ( + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/staking" @@ -17,7 +17,7 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sd valAddrs := simapp.ConvertAddrsToValAddrs(addrs) pks := simapp.CreateTestPubKeys(5) - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) app.StakingKeeper = staking.NewKeeper( appCodec, app.GetKey(staking.StoreKey), diff --git a/x/gov/keeper/querier_test.go b/x/gov/keeper/querier_test.go index 918f054a75..f0377d2f2a 100644 --- a/x/gov/keeper/querier_test.go +++ b/x/gov/keeper/querier_test.go @@ -10,8 +10,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/cosmos/cosmos-sdk/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/gov/keeper" "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -147,7 +147,7 @@ func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc codec.JSONMarshaler, que func TestQueries(t *testing.T) { app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) querier := keeper.NewQuerier(app.GovKeeper) @@ -295,7 +295,7 @@ func TestQueries(t *testing.T) { func TestPaginatedVotesQuery(t *testing.T) { app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) proposal := types.Proposal{ ProposalBase: types.ProposalBase{ diff --git a/x/staking/common_test.go b/x/staking/common_test.go index e55baa0f0a..22f388ed08 100644 --- a/x/staking/common_test.go +++ b/x/staking/common_test.go @@ -6,8 +6,8 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" "github.com/cosmos/cosmos-sdk/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - cdc "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -43,7 +43,7 @@ func getBaseSimappWithCustomKeeper() (*codec.Codec, *simapp.SimApp, sdk.Context) app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) - appCodec := cdc.NewAppCodec(codec.New()) + appCodec := codecstd.NewAppCodec(codec.New()) app.StakingKeeper = keeper.NewKeeper( appCodec, diff --git a/x/staking/keeper/common_test.go b/x/staking/keeper/common_test.go index d71737ddcf..01cb1a75d5 100644 --- a/x/staking/keeper/common_test.go +++ b/x/staking/keeper/common_test.go @@ -6,8 +6,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/cosmos/cosmos-sdk/codec" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -24,7 +24,7 @@ func createTestInput() (*codec.Codec, *simapp.SimApp, sdk.Context) { app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) - appCodec := simappcodec.NewAppCodec(codec.New()) + appCodec := codecstd.NewAppCodec(codec.New()) app.StakingKeeper = keeper.NewKeeper( appCodec, diff --git a/x/supply/keeper/bank_test.go b/x/supply/keeper/bank_test.go index cb62371478..3a4e8a15c1 100644 --- a/x/supply/keeper/bank_test.go +++ b/x/supply/keeper/bank_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" keep "github.com/cosmos/cosmos-sdk/x/supply/keeper" "github.com/cosmos/cosmos-sdk/x/supply/types" @@ -55,7 +55,7 @@ func TestSendCoins(t *testing.T) { maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[randomPerm] = []string{"random"} - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) ak := app.AccountKeeper @@ -116,7 +116,7 @@ func TestMintCoins(t *testing.T) { maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[randomPerm] = []string{"random"} - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) ak := app.AccountKeeper @@ -164,7 +164,7 @@ func TestBurnCoins(t *testing.T) { maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[randomPerm] = []string{"random"} - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) ak := app.AccountKeeper diff --git a/x/supply/keeper/keeper_test.go b/x/supply/keeper/keeper_test.go index a81575914a..d43b140d0f 100644 --- a/x/supply/keeper/keeper_test.go +++ b/x/supply/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + codecstd "github.com/cosmos/cosmos-sdk/codec/std" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" sdk "github.com/cosmos/cosmos-sdk/types" keep "github.com/cosmos/cosmos-sdk/x/supply/keeper" "github.com/cosmos/cosmos-sdk/x/supply/types" @@ -39,7 +39,7 @@ func TestValidatePermissions(t *testing.T) { maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[randomPerm] = []string{"random"} - appCodec := simappcodec.NewAppCodec(app.Codec()) + appCodec := codecstd.NewAppCodec(app.Codec()) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) err := keeper.ValidatePermissions(multiPermAcc)