remove baseapp getter

simapp/app.go

@@ -297,9 +297,6 @@ func NewSimApp(
 // Name returns the name of the App
 func (app *SimApp) Name() string { return app.BaseApp.Name() }
 
-// GetBaseApp returns the application's BaseApp
-func (app *SimApp) GetBaseApp() *bam.BaseApp { return app.BaseApp }
-
 // BeginBlocker application updates every begin block
 func (app *SimApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	return app.mm.BeginBlock(ctx, req)

simapp/sim_bench_test.go

@@ -30,7 +30,7 @@ func BenchmarkFullAppSimulation(b *testing.B) {
 	logger := log.NewNopLogger()
 	app := NewSimApp(logger, db, nil, true, FlagPeriodValue, interBlockCacheOpt())
 
-	err = RunSimulation(b, os.Stdout, db, app, config)
+	err = RunSimulation(b, os.Stdout, db, app, app.BaseApp, config)
 	if err != nil {
 		fmt.Println(err)
 		b.FailNow()
@@ -59,7 +59,7 @@ func BenchmarkInvariants(b *testing.B) {
 	app := NewSimApp(logger, db, nil, true, FlagPeriodValue, interBlockCacheOpt())
 
 	// 2. Run parameterized simulation (w/o invariants)
-	err = RunSimulation(b, os.Stdout, db, app, config)
+	err = RunSimulation(b, os.Stdout, db, app, app.BaseApp, config)
 	if err != nil {
 		fmt.Println(err)
 		b.FailNow()

simapp/sim_test.go

@@ -58,7 +58,7 @@ func TestFullAppSimulation(t *testing.T) {
 	app := NewSimApp(logger, db, nil, true, FlagPeriodValue, fauxMerkleModeOpt)
 	require.Equal(t, "SimApp", app.Name())
 
-	err = RunSimulation(t, os.Stdout, db, app, config)
+	err = RunSimulation(t, os.Stdout, db, app, app.BaseApp, config)
 	require.NoError(t, err)
 }
 
@@ -77,7 +77,7 @@ func TestAppImportExport(t *testing.T) {
 	app := NewSimApp(logger, db, nil, true, FlagPeriodValue, fauxMerkleModeOpt)
 	require.Equal(t, "SimApp", app.Name())
 
-	err = RunSimulation(t, os.Stdout, db, app, config)
+	err = RunSimulation(t, os.Stdout, db, app, app.BaseApp, config)
 	require.NoError(t, err)
 
 	fmt.Printf("exporting genesis...\n")
@@ -159,7 +159,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
 	app := NewSimApp(logger, db, nil, true, FlagPeriodValue, fauxMerkleModeOpt)
 	require.Equal(t, "SimApp", app.Name())
 
-	err = RunSimulation(t, os.Stdout, db, app, config)
+	err = RunSimulation(t, os.Stdout, db, app, app.BaseApp, config)
 	require.NoError(t, err)
 
 	fmt.Printf("exporting genesis...\n")
@@ -184,7 +184,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
 		AppStateBytes: appState,
 	})
 
-	err = RunSimulation(t, os.Stdout, db, newApp, config)
+	err = RunSimulation(t, os.Stdout, db, newApp, newApp.BaseApp, config)
 	require.NoError(t, err)
 }
 
@@ -227,7 +227,7 @@ func TestAppStateDeterminism(t *testing.T) {
 				config.Seed, i+1, numSeeds, j+1, numTimesToRunPerSeed,
 			)
 
-			err := RunSimulation(t, os.Stdout, db, app, config)
+			err := RunSimulation(t, os.Stdout, db, app, app.BaseApp, config)
 			require.NoError(t, err)
 
 			appHash := app.LastCommitID().Hash

simapp/test_helpers.go

@@ -102,7 +102,7 @@ func AddTestAddrs(app *SimApp, ctx sdk.Context, accNum int, accAmt sdk.Int) []sd
 
 // CheckBalance checks the balance of an account.
 func CheckBalance(t *testing.T, app *SimApp, addr sdk.AccAddress, exp sdk.Coins) {
-	ctxCheck := app.GetBaseApp().NewContext(true, abci.Header{})
+	ctxCheck := app.BaseApp.NewContext(true, abci.Header{})
 	res := app.AccountKeeper.GetAccount(ctxCheck, addr)
 
 	require.Equal(t, exp, res.GetCoins())

simapp/types/types.go

@@ -9,23 +9,16 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	"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/x/params"
 )
 
 // App implements the common methods for a Cosmos SDK-based application
 // specific blockchain.
 type App interface {
-	GetBaseApp() *baseapp.BaseApp
-
 	Name() string
 	Codec() *codec.Codec
-	GetKey(storeKey string) *sdk.KVStoreKey
-	GetTKey(storeKey string) *sdk.TransientStoreKey
-	GetSubspace(moduleName string) params.Subspace
 
 	BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock
 	EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock

simapp/utils.go

@@ -13,6 +13,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	"github.com/cosmos/cosmos-sdk/simapp/types"
@@ -194,11 +195,12 @@ func SetupSimulation(dirPrefix, dbName string) (simulation.Config, dbm.DB, strin
 // RunSimulation runs a randomized simulation from the operations defined in an
 // app. It also exports the state and params and prints the DB stats.
 func RunSimulation(
-	tb testing.TB, w io.Writer, db dbm.DB, app types.App, config simulation.Config,
+	tb testing.TB, w io.Writer, db dbm.DB, app types.App, bapp *baseapp.BaseApp,
+	config simulation.Config,
 ) error {
 	// run randomized simulation
 	stopEarly, simParams, simErr := simulation.SimulateFromSeed(
-		tb, w, app.GetBaseApp(), AppStateFn(app.Codec(), app.SimulationManager()),
+		tb, w, bapp, AppStateFn(app.Codec(), app.SimulationManager()),
 		SimulationOperations(app, app.Codec(), config),
 		app.ModuleAccountAddrs(), config,
 	)