diff --git a/baseapp/msg_service_router_test.go b/baseapp/msg_service_router_test.go index 1aba28a7a667..f0f9be57b43f 100644 --- a/baseapp/msg_service_router_test.go +++ b/baseapp/msg_service_router_test.go @@ -22,7 +22,7 @@ import ( func TestMsgService(t *testing.T) { priv, _, _ := testdata.KeyTestPubAddr() - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() db := dbm.NewMemDB() app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder()) app.SetInterfaceRegistry(encCfg.InterfaceRegistry) diff --git a/client/grpc/simulate/simulate_test.go b/client/grpc/simulate/simulate_test.go index 21741515f87b..7e25c1123297 100644 --- a/client/grpc/simulate/simulate_test.go +++ b/client/grpc/simulate/simulate_test.go @@ -39,7 +39,7 @@ func (s *IntegrationTestSuite) SetupSuite() { app.BankKeeper.SetParams(sdkCtx, banktypes.DefaultParams()) // Set up TxConfig. - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}.WithTxConfig(encodingConfig.TxConfig) // Create new simulation server. diff --git a/client/query.go b/client/query.go index ac08da855cbe..18a5c3c2f4ee 100644 --- a/client/query.go +++ b/client/query.go @@ -52,19 +52,6 @@ func (ctx Context) QueryABCI(req abci.RequestQuery) (abci.ResponseQuery, error) return ctx.queryABCI(req) } -// QuerySubspace performs a query to a Tendermint node with the provided -// store name and subspace. It returns key value pair and height of the query -// upon success or an error if the query fails. -func (ctx Context) QuerySubspace(subspace []byte, storeName string) (res []sdk.KVPair, height int64, err error) { - resRaw, height, err := ctx.queryStore(subspace, storeName, "subspace") - if err != nil { - return res, height, err - } - - ctx.LegacyAmino.MustUnmarshalBinaryBare(resRaw, &res) - return -} - // GetFromAddress returns the from address from the context's name. func (ctx Context) GetFromAddress() sdk.AccAddress { return ctx.FromAddress diff --git a/client/tx/legacy_test.go b/client/tx/legacy_test.go index a2fd78fa40d8..4884faa83c5e 100644 --- a/client/tx/legacy_test.go +++ b/client/tx/legacy_test.go @@ -57,7 +57,7 @@ type TestSuite struct { } func (s *TestSuite) SetupSuite() { - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() s.encCfg = encCfg s.protoCfg = tx.NewTxConfig(codec.NewProtoCodec(encCfg.InterfaceRegistry), tx.DefaultSignModes) s.aminoCfg = legacytx.StdTxConfig{Cdc: encCfg.Amino} diff --git a/client/tx/tx_test.go b/client/tx/tx_test.go index d5d5a43e1022..41a021fef1b5 100644 --- a/client/tx/tx_test.go +++ b/client/tx/tx_test.go @@ -18,7 +18,7 @@ import ( ) func NewTestTxConfig() client.TxConfig { - cfg := simapp.MakeEncodingConfigTests() + cfg := simapp.MakeEncodingConfig() return cfg.TxConfig } diff --git a/server/export_test.go b/server/export_test.go index ca298601311f..ac0cf6b6596e 100644 --- a/server/export_test.go +++ b/server/export_test.go @@ -128,7 +128,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *t logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) db := dbm.NewMemDB() - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() app := simapp.NewSimApp(logger, db, nil, true, map[int64]bool{}, tempDir, 0, encCfg) serverCtx := server.NewDefaultContext() @@ -149,7 +149,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *t cmd := server.ExportCmd( func(_ log.Logger, _ dbm.DB, _ io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string) (types.ExportedApp, error) { - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() var simApp *simapp.SimApp if height != -1 { diff --git a/simapp/app.go b/simapp/app.go index a2484a63224c..c7cc7542622a 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -432,7 +432,7 @@ func NewSimApp( // simapp. It is useful for tests and clients who do not want to construct the // full simapp func MakeCodecs() (codec.Marshaler, *codec.LegacyAmino) { - config := MakeEncodingConfigTests() + config := MakeEncodingConfig() return config.Marshaler, config.Amino } diff --git a/simapp/app_test.go b/simapp/app_test.go index 9aa3ba8fadc1..4a8797562287 100644 --- a/simapp/app_test.go +++ b/simapp/app_test.go @@ -14,7 +14,7 @@ import ( func TestSimAppExport(t *testing.T) { db := dbm.NewMemDB() - app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfigTests()) + app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig()) genesisState := NewDefaultGenesisState() stateBytes, err := json.MarshalIndent(genesisState, "", " ") @@ -30,7 +30,7 @@ func TestSimAppExport(t *testing.T) { app.Commit() // Making a new app object with the db, so that initchain hasn't been called - app2 := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfigTests()) + app2 := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig()) _, err = app2.ExportAppStateAndValidators(false, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") } @@ -38,7 +38,7 @@ func TestSimAppExport(t *testing.T) { // ensure that blocked addresses are properly set in bank keeper func TestBlockedAddrs(t *testing.T) { db := dbm.NewMemDB() - app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfigTests()) + app := NewSimApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig()) for acc := range maccPerms { require.Equal(t, !allowedReceivingModAcc[acc], app.BankKeeper.BlockedAddr(app.AccountKeeper.GetModuleAddress(acc))) diff --git a/simapp/encoding.go b/simapp/encoding.go index 6beb3064552e..3e5e3f8ab827 100644 --- a/simapp/encoding.go +++ b/simapp/encoding.go @@ -2,11 +2,15 @@ package simapp import ( simapparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/std" ) -// MakeEncodingConfigTests creates an EncodingConfig for testing -func MakeEncodingConfigTests() simapparams.EncodingConfig { +// MakeEncodingConfig creates an EncodingConfig for testing +func MakeEncodingConfig() simapparams.EncodingConfig { encodingConfig := simapparams.MakeEncodingConfig() - encodingConfig.RegisterCodecsTests(ModuleBasics) + std.RegisterLegacyAminoCodec(encodingConfig.Amino) + std.RegisterInterfaces(encodingConfig.InterfaceRegistry) + ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino) + ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry) return encodingConfig } diff --git a/simapp/genesis.go b/simapp/genesis.go index 6317670a2af7..5a8f18b1aae4 100644 --- a/simapp/genesis.go +++ b/simapp/genesis.go @@ -15,6 +15,6 @@ type GenesisState map[string]json.RawMessage // NewDefaultGenesisState generates the default state for the application. func NewDefaultGenesisState() GenesisState { - encCfg := MakeEncodingConfigTests() + encCfg := MakeEncodingConfig() return ModuleBasics.DefaultGenesis(encCfg.Marshaler) } diff --git a/simapp/params/encoding.go b/simapp/params/encoding.go index f3612f7d8f94..698408dafdcb 100644 --- a/simapp/params/encoding.go +++ b/simapp/params/encoding.go @@ -4,8 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/std" - "github.com/cosmos/cosmos-sdk/types/module" ) // EncodingConfig specifies the concrete encoding types to use for a given app. @@ -16,14 +14,3 @@ type EncodingConfig struct { TxConfig client.TxConfig Amino *codec.LegacyAmino } - -// RegisterCodecsTests registars codecs from the config to the global and -// modules scope (mbm != nil). -func (ec *EncodingConfig) RegisterCodecsTests(mbm module.BasicManager) { - std.RegisterLegacyAminoCodec(ec.Amino) - std.RegisterInterfaces(ec.InterfaceRegistry) - if mbm != nil { - mbm.RegisterLegacyAminoCodec(ec.Amino) - mbm.RegisterInterfaces(ec.InterfaceRegistry) - } -} diff --git a/simapp/sim_bench_test.go b/simapp/sim_bench_test.go index 86e2f1001e26..660e0fb8f059 100644 --- a/simapp/sim_bench_test.go +++ b/simapp/sim_bench_test.go @@ -27,7 +27,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { } }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), interBlockCacheOpt()) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( @@ -39,7 +39,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics, + app.AppCodec(), ) // export state and simParams before the simulation error is checked @@ -72,7 +72,7 @@ func BenchmarkInvariants(b *testing.B) { } }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), interBlockCacheOpt()) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( @@ -84,7 +84,7 @@ func BenchmarkInvariants(b *testing.B) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics, + app.AppCodec(), ) // export state and simParams before the simulation error is checked diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 23d6e0e8284e..ad3633132d59 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -68,7 +68,7 @@ func TestFullAppSimulation(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), fauxMerkleModeOpt) require.Equal(t, "SimApp", app.Name()) // run randomized simulation @@ -81,7 +81,7 @@ func TestFullAppSimulation(t *testing.T) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics, + app.AppCodec(), ) // export state and simParams before the simulation error is checked @@ -106,7 +106,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), fauxMerkleModeOpt) require.Equal(t, "SimApp", app.Name()) // Run randomized simulation @@ -119,7 +119,8 @@ func TestAppImportExport(t *testing.T) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics) + app.AppCodec(), + ) // export state and simParams before the simulation error is checked err = CheckExportSimulation(app, config, simParams) @@ -145,7 +146,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), fauxMerkleModeOpt) + newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), fauxMerkleModeOpt) require.Equal(t, "SimApp", newApp.Name()) var genesisState GenesisState @@ -202,7 +203,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), fauxMerkleModeOpt) require.Equal(t, "SimApp", app.Name()) // Run randomized simulation @@ -215,7 +216,8 @@ func TestAppSimulationAfterImport(t *testing.T) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics) + app.AppCodec(), + ) // export state and simParams before the simulation error is checked err = CheckExportSimulation(app, config, simParams) @@ -246,7 +248,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), fauxMerkleModeOpt) + newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), fauxMerkleModeOpt) require.Equal(t, "SimApp", newApp.Name()) newApp.InitChain(abci.RequestInitChain{ @@ -262,7 +264,8 @@ func TestAppSimulationAfterImport(t *testing.T) { SimulationOperations(newApp, newApp.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics) + app.AppCodec(), + ) require.NoError(t, err) } @@ -296,7 +299,7 @@ func TestAppStateDeterminism(t *testing.T) { } db := dbm.NewMemDB() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfigTests(), interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeEncodingConfig(), interBlockCacheOpt()) fmt.Printf( "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n", @@ -312,7 +315,7 @@ func TestAppStateDeterminism(t *testing.T) { SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, - ModuleBasics, + app.AppCodec(), ) require.NoError(t, err) diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index fce511440dae..b01b1704566c 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -38,7 +38,7 @@ import ( // NewRootCmd creates a new root command for simd. It is called once in the // main function. func NewRootCmd() (*cobra.Command, params.EncodingConfig) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() initClientCtx := client.Context{}. WithJSONMarshaler(encodingConfig.Marshaler). WithInterfaceRegistry(encodingConfig.InterfaceRegistry). @@ -191,7 +191,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty logger, db, traceStore, true, skipUpgradeHeights, cast.ToString(appOpts.Get(flags.FlagHome)), cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), - simapp.MakeEncodingConfigTests(), // Ideally, we would reuse the one created by NewRootCmd. + simapp.MakeEncodingConfig(), // Ideally, we would reuse the one created by NewRootCmd. baseapp.SetPruning(pruningOpts), baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))), baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))), @@ -211,7 +211,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty func createSimappAndExport( logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailAllowedAddrs []string, ) (servertypes.ExportedApp, error) { - encCfg := simapp.MakeEncodingConfigTests() // Ideally, we would reuse the one created by NewRootCmd. + encCfg := simapp.MakeEncodingConfig() // Ideally, we would reuse the one created by NewRootCmd. encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry) var simApp *simapp.SimApp if height != -1 { diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index cfd74f82e0d5..c627d57b18d5 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -51,7 +51,7 @@ var DefaultConsensusParams = &abci.ConsensusParams{ // Setup initializes a new SimApp. A Nop logger is set in SimApp. func Setup(isCheckTx bool) *SimApp { db := dbm.NewMemDB() - app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfigTests()) + app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig()) if !isCheckTx { // init chain must be called to stop deliverState from being nil genesisState := NewDefaultGenesisState() @@ -79,7 +79,7 @@ func Setup(isCheckTx bool) *SimApp { // account. A Nop logger is set in SimApp. func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp { db := dbm.NewMemDB() - app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfigTests()) + app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 5, MakeEncodingConfig()) genesisState := NewDefaultGenesisState() @@ -160,7 +160,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs // accounts and possible balances. func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp { db := dbm.NewMemDB() - app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfigTests()) + app := NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, DefaultNodeHome, 0, MakeEncodingConfig()) // initialize the chain with the passed in genesis accounts genesisState := NewDefaultGenesisState() diff --git a/testutil/network/network.go b/testutil/network/network.go index e997574296b6..1ab9006f8ea1 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -94,7 +94,7 @@ type Config struct { // DefaultConfig returns a sane default configuration suitable for nearly all // testing requirements. func DefaultConfig() Config { - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() return Config{ Codec: encCfg.Marshaler, diff --git a/x/auth/ante/testutil_test.go b/x/auth/ante/testutil_test.go index 2bfce4db681f..a6755d0c35af 100644 --- a/x/auth/ante/testutil_test.go +++ b/x/auth/ante/testutil_test.go @@ -53,7 +53,7 @@ func (suite *AnteTestSuite) SetupTest(isCheckTx bool) { suite.ctx = suite.ctx.WithBlockHeight(1) // Set up TxConfig. - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() // We're using TestMsg encoding in some tests, so register it here. encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil) testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry) diff --git a/x/auth/client/cli/cli_test.go b/x/auth/client/cli/cli_test.go index fc344b8e32e4..72e53a97a4ee 100644 --- a/x/auth/client/cli/cli_test.go +++ b/x/auth/client/cli/cli_test.go @@ -756,7 +756,7 @@ func (s *IntegrationTestSuite) TestGetAccountCmd() { func TestGetBroadcastCommand_OfflineFlag(t *testing.T) { clientCtx := client.Context{}.WithOffline(true) - clientCtx = clientCtx.WithTxConfig(simapp.MakeEncodingConfigTests().TxConfig) + clientCtx = clientCtx.WithTxConfig(simapp.MakeEncodingConfig().TxConfig) cmd := authcli.GetBroadcastCommand() _ = testutil.ApplyMockIODiscardOutErr(cmd) @@ -767,7 +767,7 @@ func TestGetBroadcastCommand_OfflineFlag(t *testing.T) { func TestGetBroadcastCommand_WithoutOfflineFlag(t *testing.T) { clientCtx := client.Context{} - txCfg := simapp.MakeEncodingConfigTests().TxConfig + txCfg := simapp.MakeEncodingConfig().TxConfig clientCtx = clientCtx.WithTxConfig(txCfg) ctx := context.Background() diff --git a/x/auth/client/tx_test.go b/x/auth/client/tx_test.go index b7950f65d0a7..7ab1597bc8e6 100644 --- a/x/auth/client/tx_test.go +++ b/x/auth/client/tx_test.go @@ -55,7 +55,7 @@ func TestDefaultTxEncoder(t *testing.T) { func TestReadTxFromFile(t *testing.T) { t.Parallel() - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() txCfg := encodingConfig.TxConfig clientCtx := client.Context{} @@ -90,7 +90,7 @@ func TestReadTxFromFile(t *testing.T) { func TestBatchScanner_Scan(t *testing.T) { t.Parallel() - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() txGen := encodingConfig.TxConfig clientCtx := client.Context{} diff --git a/x/auth/legacy/v040/migrate_test.go b/x/auth/legacy/v040/migrate_test.go index 541bf8461341..519b3cb48342 100644 --- a/x/auth/legacy/v040/migrate_test.go +++ b/x/auth/legacy/v040/migrate_test.go @@ -17,7 +17,7 @@ import ( ) func TestMigrate(t *testing.T) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 4abd799bba80..c8a5c88985b9 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -109,7 +109,7 @@ func TestSendNotEnoughBalance(t *testing.T) { sendMsg := types.NewMsgSend(addr1, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 100)}) header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{sendMsg}, "", []uint64{origAccNum}, []uint64{origSeq}, false, false, priv1) require.Error(t, err) @@ -182,7 +182,7 @@ func TestSendToModuleAcc(t *testing.T) { origSeq := res1.GetSequence() header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{test.msg}, "", []uint64{origAccNum}, []uint64{origSeq}, test.expSimPass, test.expPass, priv1) if test.expPass { require.NoError(t, err) @@ -256,7 +256,7 @@ func TestMsgMultiSendWithAccounts(t *testing.T) { for _, tc := range testCases { header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) if tc.expPass { require.NoError(t, err) @@ -308,7 +308,7 @@ func TestMsgMultiSendMultipleOut(t *testing.T) { for _, tc := range testCases { header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) @@ -363,7 +363,7 @@ func TestMsgMultiSendMultipleInOut(t *testing.T) { for _, tc := range testCases { header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) @@ -416,7 +416,7 @@ func TestMsgMultiSendDependent(t *testing.T) { for _, tc := range testCases { header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) diff --git a/x/bank/client/rest/tx_test.go b/x/bank/client/rest/tx_test.go index 5c2d26aac6fe..0e52408fed7d 100644 --- a/x/bank/client/rest/tx_test.go +++ b/x/bank/client/rest/tx_test.go @@ -18,7 +18,7 @@ import ( ) func (s *IntegrationTestSuite) TestCoinSend() { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() authclient.Codec = encodingConfig.Marshaler val := s.network.Validators[0] diff --git a/x/bank/legacy/v040/migrate_test.go b/x/bank/legacy/v040/migrate_test.go index d0a4000b9df3..99ea461ff78c 100644 --- a/x/bank/legacy/v040/migrate_test.go +++ b/x/bank/legacy/v040/migrate_test.go @@ -16,7 +16,7 @@ import ( ) func TestMigrate(t *testing.T) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go index e5c422eb2e95..c533b01af658 100644 --- a/x/crisis/handler_test.go +++ b/x/crisis/handler_test.go @@ -27,7 +27,7 @@ var ( func createTestApp() (*simapp.SimApp, sdk.Context, []sdk.AccAddress) { db := dbm.NewMemDB() - app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 1, simapp.MakeEncodingConfigTests()) + app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 1, simapp.MakeEncodingConfig()) ctx := app.NewContext(true, tmproto.Header{}) constantFee := sdk.NewInt64Coin(sdk.DefaultBondDenom, 10) diff --git a/x/evidence/legacy/v040/migrate_test.go b/x/evidence/legacy/v040/migrate_test.go index 9efda37adc91..a9c23093f47f 100644 --- a/x/evidence/legacy/v040/migrate_test.go +++ b/x/evidence/legacy/v040/migrate_test.go @@ -13,7 +13,7 @@ import ( ) func TestMigrate(t *testing.T) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). diff --git a/x/genutil/gentx_test.go b/x/genutil/gentx_test.go index d6a627569aa3..671431ed9e56 100644 --- a/x/genutil/gentx_test.go +++ b/x/genutil/gentx_test.go @@ -47,7 +47,7 @@ func (suite *GenTxTestSuite) SetupTest() { app := simapp.Setup(checkTx) suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{}) suite.app = app - suite.encodingConfig = simapp.MakeEncodingConfigTests() + suite.encodingConfig = simapp.MakeEncodingConfig() var err error amount := sdk.NewInt64Coin(sdk.DefaultBondDenom, 50) diff --git a/x/genutil/types/genesis_state_test.go b/x/genutil/types/genesis_state_test.go index 1c8cc4c88379..ce0015420d0d 100644 --- a/x/genutil/types/genesis_state_test.go +++ b/x/genutil/types/genesis_state_test.go @@ -45,14 +45,14 @@ func TestValidateGenesisMultipleMessages(t *testing.T) { sdk.NewInt64Coin(sdk.DefaultBondDenom, 50), desc, comm, sdk.OneInt()) require.NoError(t, err) - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig txBuilder := txGen.NewTxBuilder() require.NoError(t, txBuilder.SetMsgs(msg1, msg2)) tx := txBuilder.GetTx() genesisState := types.NewGenesisStateFromTx(txGen.TxJSONEncoder(), []sdk.Tx{tx}) - err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfigTests().TxConfig.TxJSONDecoder()) + err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfig().TxConfig.TxJSONDecoder()) require.Error(t, err) } @@ -61,7 +61,7 @@ func TestValidateGenesisBadMessage(t *testing.T) { msg1 := stakingtypes.NewMsgEditValidator(sdk.ValAddress(pk1.Address()), desc, nil, nil) - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig txBuilder := txGen.NewTxBuilder() err := txBuilder.SetMsgs(msg1) require.NoError(t, err) @@ -69,7 +69,7 @@ func TestValidateGenesisBadMessage(t *testing.T) { tx := txBuilder.GetTx() genesisState := types.NewGenesisStateFromTx(txGen.TxJSONEncoder(), []sdk.Tx{tx}) - err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfigTests().TxConfig.TxJSONDecoder()) + err = types.ValidateGenesis(genesisState, simapp.MakeEncodingConfig().TxConfig.TxJSONDecoder()) require.Error(t, err) } diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 4425b37c541e..c6f999e86ee6 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -147,7 +147,7 @@ func TestGetPaginatedVotes(t *testing.T) { cdc = newTestCodec() ) - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() cli := TxSearchMock{txs: marshalled} clientCtx := client.Context{}. WithLegacyAmino(cdc). diff --git a/x/gov/genesis_test.go b/x/gov/genesis_test.go index 6a2598fa06c4..ca1655ecbadb 100644 --- a/x/gov/genesis_test.go +++ b/x/gov/genesis_test.go @@ -68,7 +68,7 @@ func TestImportExportQueues(t *testing.T) { } db := dbm.NewMemDB() - app2 := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 0, simapp.MakeEncodingConfigTests()) + app2 := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 0, simapp.MakeEncodingConfig()) app2.InitChain( abci.RequestInitChain{ diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index eab8c5b6e69d..ef1628d73c37 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -152,7 +152,7 @@ func NewTestChain(t *testing.T, chainID string) *TestChain { Time: globalStartTime, } - txConfig := simapp.MakeEncodingConfigTests().TxConfig + txConfig := simapp.MakeEncodingConfig().TxConfig // create an account to send transactions from chain := &TestChain{ diff --git a/x/params/keeper/common_test.go b/x/params/keeper/common_test.go index bd1811e60620..eb60d12b8b20 100644 --- a/x/params/keeper/common_test.go +++ b/x/params/keeper/common_test.go @@ -14,7 +14,7 @@ import ( ) func testComponents() (*codec.LegacyAmino, sdk.Context, sdk.StoreKey, sdk.StoreKey, paramskeeper.Keeper) { - marshaler := simapp.MakeEncodingConfigTests().Marshaler + marshaler := simapp.MakeEncodingConfig().Marshaler legacyAmino := createTestCodec() mkey := sdk.NewKVStoreKey("test") tkey := sdk.NewTransientStoreKey("transient_test") diff --git a/x/params/proposal_handler_test.go b/x/params/proposal_handler_test.go index 50c132033877..b810a490cf75 100644 --- a/x/params/proposal_handler_test.go +++ b/x/params/proposal_handler_test.go @@ -76,7 +76,7 @@ func newTestInput(t *testing.T) testInput { err := cms.LoadLatestVersion() require.Nil(t, err) - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() keeper := keeper.NewKeeper(encCfg.Marshaler, encCfg.Amino, keyParams, tKeyParams) ctx := sdk.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index 735dba7f0c6a..f9a816641f8c 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -34,7 +34,7 @@ func (suite *SubspaceTestSuite) SetupTest() { ms.MountStoreWithDB(tkey, sdk.StoreTypeTransient, db) suite.NoError(ms.LoadLatestVersion()) - encCfg := simapp.MakeEncodingConfigTests() + encCfg := simapp.MakeEncodingConfig() ss := types.NewSubspace(encCfg.Marshaler, encCfg.Amino, key, tkey, "testsubspace") suite.cdc = encCfg.Marshaler diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go index a42570ead5ca..ec07d7971a56 100644 --- a/x/simulation/simulate.go +++ b/x/simulation/simulate.go @@ -14,9 +14,8 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" - simapparams "github.com/cosmos/cosmos-sdk/simapp/params" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/simulation" ) @@ -25,16 +24,11 @@ const AverageBlockTime = 6 * time.Second // initialize the chain for the simulation func initChain( r *rand.Rand, params Params, accounts []simulation.Account, app *baseapp.BaseApp, - appStateFn simulation.AppStateFn, config simulation.Config, mbm module.BasicManager, + appStateFn simulation.AppStateFn, config simulation.Config, marshaler codec.Marshaler, ) (mockValidators, time.Time, []simulation.Account, string) { appState, accounts, chainID, genesisTimestamp := appStateFn(r, accounts, config) - // we would like to use simapp version, but this creates import cycles: - // simapp -> x/module -> x/module/simulation -> x/simulation -> simapp - // cdc := simapp.MakeEncodingConfigTests().Marshaler - ec := simapparams.MakeEncodingConfig() - ec.RegisterCodecsTests(mbm) - consensusParams := randomConsensusParams(r, appState, ec.Marshaler) + consensusParams := randomConsensusParams(r, appState, marshaler) req := abci.RequestInitChain{ AppStateBytes: appState, @@ -59,7 +53,7 @@ func SimulateFromSeed( ops WeightedOperations, blockedAddrs map[string]bool, config simulation.Config, - mbm module.BasicManager, + marshaler codec.Marshaler, ) (stopEarly bool, exportedParams Params, err error) { // in case we have to end early, don't os.Exit so that we can run cleanup code. testingMode, _, b := getTestingMode(tb) @@ -75,7 +69,7 @@ func SimulateFromSeed( // Second variable to keep pending validator set (delayed one block since // TM 0.24) Initially this is the same as the initial validator set - validators, genesisTimestamp, accs, chainID := initChain(r, params, accs, app, appStateFn, config, mbm) + validators, genesisTimestamp, accs, chainID := initChain(r, params, accs, app, appStateFn, config, marshaler) if len(accs) == 0 { return true, params, fmt.Errorf("must have greater than zero genesis accounts") } diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go index a4a7ac32a9e9..f16bfb36f11a 100644 --- a/x/slashing/app_test.go +++ b/x/slashing/app_test.go @@ -69,7 +69,7 @@ func TestSlashingMsgs(t *testing.T) { require.NoError(t, err) header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{0}, []uint64{0}, true, true, priv1) require.NoError(t, err) simapp.CheckBalance(t, app, addr1, sdk.Coins{genCoin.Sub(bondCoin)}) diff --git a/x/slashing/legacy/v040/migrate_test.go b/x/slashing/legacy/v040/migrate_test.go index c0a5f7480567..513627659d30 100644 --- a/x/slashing/legacy/v040/migrate_test.go +++ b/x/slashing/legacy/v040/migrate_test.go @@ -14,7 +14,7 @@ import ( ) func TestMigrate(t *testing.T) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). diff --git a/x/staking/app_test.go b/x/staking/app_test.go index c0297b8a2738..1c60ec50278d 100644 --- a/x/staking/app_test.go +++ b/x/staking/app_test.go @@ -71,7 +71,7 @@ func TestStakingMsgs(t *testing.T) { require.NoError(t, err) header := tmproto.Header{Height: app.LastBlockHeight() + 1} - txGen := simapp.MakeEncodingConfigTests().TxConfig + txGen := simapp.MakeEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{0}, []uint64{0}, true, true, priv1) require.NoError(t, err) simapp.CheckBalance(t, app, addr1, sdk.Coins{genCoin.Sub(bondCoin)}) diff --git a/x/staking/client/cli/cli_test.go b/x/staking/client/cli/cli_test.go index 3ec0546665c9..2b66da867c05 100644 --- a/x/staking/client/cli/cli_test.go +++ b/x/staking/client/cli/cli_test.go @@ -4,7 +4,6 @@ package cli_test import ( "context" - json "encoding/json" "fmt" "strings" "testing" @@ -277,9 +276,9 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidators() { out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args) s.Require().NoError(err) - var result []types.Validator - s.Require().NoError(json.Unmarshal(out.Bytes(), &result)) - s.Require().Equal(len(s.network.Validators), len(result)) + var result types.QueryValidatorsResponse + s.Require().NoError(clientCtx.JSONMarshaler.UnmarshalJSON(out.Bytes(), &result)) + s.Require().Equal(len(s.network.Validators), len(result.Validators)) }) } } diff --git a/x/staking/client/cli/query.go b/x/staking/client/cli/query.go index eeb2bb95b079..ec99b6b57c2d 100644 --- a/x/staking/client/cli/query.go +++ b/x/staking/client/cli/query.go @@ -113,22 +113,21 @@ $ %s query staking validators return err } - resKVs, _, err := clientCtx.QuerySubspace(types.ValidatorsKey, types.StoreKey) + queryClient := types.NewQueryClient(clientCtx) + pageReq, err := client.ReadPageRequest(cmd.Flags()) if err != nil { return err } - var validators types.Validators - for _, kv := range resKVs { - validator, err := types.UnmarshalValidator(types.ModuleCdc, kv.Value) - if err != nil { - return err - } - - validators = append(validators, validator) + result, err := queryClient.Validators(context.Background(), &types.QueryValidatorsRequest{ + // Leaving status empty on purpose to query all validators. + Pagination: pageReq, + }) + if err != nil { + return err } - return clientCtx.PrintOutputLegacy(validators) + return clientCtx.PrintOutput(result) }, } diff --git a/x/staking/legacy/v040/migrate_test.go b/x/staking/legacy/v040/migrate_test.go index 5826aa269295..f54fec0e94d6 100644 --- a/x/staking/legacy/v040/migrate_test.go +++ b/x/staking/legacy/v040/migrate_test.go @@ -15,7 +15,7 @@ import ( ) func TestMigrate(t *testing.T) { - encodingConfig := simapp.MakeEncodingConfigTests() + encodingConfig := simapp.MakeEncodingConfig() clientCtx := client.Context{}. WithInterfaceRegistry(encodingConfig.InterfaceRegistry). WithTxConfig(encodingConfig.TxConfig). diff --git a/x/upgrade/abci_test.go b/x/upgrade/abci_test.go index 906eedd3bdef..48ad99301e96 100644 --- a/x/upgrade/abci_test.go +++ b/x/upgrade/abci_test.go @@ -40,7 +40,7 @@ var s TestSuite func setupTest(height int64, skip map[int64]bool) TestSuite { db := dbm.NewMemDB() - app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, skip, simapp.DefaultNodeHome, 0, simapp.MakeEncodingConfigTests()) + app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, skip, simapp.DefaultNodeHome, 0, simapp.MakeEncodingConfig()) genesisState := simapp.NewDefaultGenesisState() stateBytes, err := json.MarshalIndent(genesisState, "", " ") if err != nil {