chore: remove baseapp and sdk.Context fully from x/upgrade

core/testing/branch.go

@@ -0,0 +1,25 @@
+package coretesting
+
+import (
+	"context"
+
+	"cosmossdk.io/core/branch"
+)
+
+var _ branch.Service = &TestBranchService{}
+
+type TestBranchService struct{}
+
+func (bs TestBranchService) Execute(ctx context.Context, f func(ctx context.Context) error) error {
+	unwrap(ctx) // check that this is a testing context
+	return f(ctx)
+}
+
+func (bs TestBranchService) ExecuteWithGasLimit(
+	ctx context.Context,
+	gasLimit uint64,
+	f func(ctx context.Context) error,
+) (gasUsed uint64, err error) {
+	unwrap(ctx) // check that this is a testing context
+	return gasLimit, f(ctx)
+}

core/testing/environment.go

@@ -33,7 +33,7 @@ func NewTestEnvironment(cfg TestEnvironmentConfig) (TestContext, TestEnvironment
 	env := TestEnvironment{
 		Environment: appmodulev2.Environment{
 			Logger:             cfg.Logger,
-			BranchService:      nil,
+			BranchService:      TestBranchService{},
 			EventService:       testEventService,
 			GasService:         TestGasService{},
 			HeaderService:      testHeaderService,

go.mod

@@ -169,9 +169,7 @@ require (
 
 // Here are the short-lived replace from the Cosmos SDK
 // Replace here are pending PRs, or version to be tagged
-// replace (
-// 	<temporary replace>
-// )
+replace cosmossdk.io/core/testing => ./core/testing
 
 // TODO remove after all modules have their own go.mods
 replace (

go.sum

@@ -10,8 +10,6 @@ cosmossdk.io/collections v1.1.0 h1:UgfDUtQbRcA6uTrwd4Z6lhxMWhHPUTneXCHkWztyvMM=
 cosmossdk.io/collections v1.1.0/go.mod h1:D2iuLsFTDseILML+2rCnWIRFyFgl5cyveZ6kNTQALd4=
 cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U=
 cosmossdk.io/core v1.0.0/go.mod h1:mKIp3RkoEmtqdEdFHxHwWAULRe+79gfdOvmArrLDbDc=
-cosmossdk.io/core/testing v0.0.1 h1:gYCTaftcRrz+HoNXmK7r9KgbG1jgBJ8pNzm/Pa/erFQ=
-cosmossdk.io/core/testing v0.0.1/go.mod h1:2VDNz/25qtxgPa0+j8LW5e8Ev/xObqoJA7QuJS9/wIQ=
 cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E=
 cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=

tests/integration/bank/app_test.go

@@ -90,6 +90,7 @@ func createTestSuite(t *testing.T, genesisAccounts []authtypes.GenesisAccount) s
 	startupCfg := simtestutil.DefaultStartUpConfig()
 	startupCfg.GenesisAccounts = genAccounts
 
+	// TODO use a v2 application
 	app, err := simtestutil.SetupWithConfiguration(
 		depinject.Configs(
 			configurator.NewAppConfig(
@@ -106,9 +107,16 @@ func createTestSuite(t *testing.T, genesisAccounts []authtypes.GenesisAccount) s
 			),
 			depinject.Supply(log.NewNopLogger()),
 		),
-		startupCfg, &res.BankKeeper, &res.AccountKeeper, &res.DistributionKeeper, &res.TxConfig)
+		startupCfg,
+		&res.BankKeeper,
+		&res.AccountKeeper,
+		&res.DistributionKeeper,
+		&res.TxConfig,
+	)
 
 	res.App = app
+	res.App.SetTxEncoder(res.TxConfig.TxEncoder())
+	res.App.SetTxDecoder(res.TxConfig.TxDecoder())
 
 	require.NoError(t, err)
 	return res

tests/integration/baseapp/block_gas_test.go

@@ -103,6 +103,9 @@ func TestBaseApp_BlockGas(t *testing.T) {
 		require.NoError(t, err)
 
 		bapp := appBuilder.Build(coretesting.NewMemDB(), nil)
+		bapp.SetTxEncoder(txConfig.TxEncoder())
+		bapp.SetTxDecoder(txConfig.TxDecoder())
+
 		err = bapp.Load(true)
 		require.NoError(t, err)
 

x/auth/ante/testutil_test.go

@@ -20,7 +20,6 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	txsigning "cosmossdk.io/x/tx/signing"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
@@ -99,14 +98,11 @@ func SetupTestSuite(t *testing.T, isCheckTx bool) *AnteTestSuite {
 		"random":                 {"random"},
 	}
 
-	msgRouter := baseapp.NewMsgServiceRouter()
-	grpcQueryRouter := baseapp.NewGRPCQueryRouter()
-	grpcQueryRouter.SetInterfaceRegistry(suite.encCfg.InterfaceRegistry)
-
 	suite.consensusKeeper = antetestutil.NewMockConsensusKeeper(ctrl)
 	suite.consensusKeeper.EXPECT().BlockParams(gomock.Any()).Return(uint64(simtestutil.DefaultConsensusParams.Block.MaxGas), uint64(simtestutil.DefaultConsensusParams.Block.MaxBytes), nil).AnyTimes()
 
-	suite.env = runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter))
+	suite.env = runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
+
 	suite.accountKeeper = keeper.NewAccountKeeper(
 		runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger()), suite.encCfg.Codec, types.ProtoBaseAccount, suite.acctsModKeeper, maccPerms, authcodec.NewBech32Codec("cosmos"),
 		sdk.Bech32MainPrefix, types.NewModuleAddress("gov").String(),

x/auth/keeper/deterministic_test.go

@@ -14,9 +14,10 @@ import (
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/header"
 	coretesting "cosmossdk.io/core/testing"
+	"cosmossdk.io/core/testing/queryclient"
 	storetypes "cosmossdk.io/store/types"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
+	"github.com/cosmos/cosmos-sdk/codec"
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/runtime"
@@ -36,7 +37,6 @@ type DeterministicTestSuite struct {
 
 	accountNumberLanes uint64
 
-	key            *storetypes.KVStoreKey
 	environment    appmodule.Environment
 	ctx            sdk.Context
 	queryClient    types.QueryClient
@@ -97,11 +97,10 @@ func (suite *DeterministicTestSuite) SetupTest() {
 		types.NewModuleAddress("gov").String(),
 	)
 
-	queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.encCfg.InterfaceRegistry)
+	queryHelper := queryclient.NewQueryHelper(codec.NewProtoCodec(suite.encCfg.InterfaceRegistry).GRPCCodec())
 	types.RegisterQueryServer(queryHelper, keeper.NewQueryServer(suite.accountKeeper))
 	suite.queryClient = types.NewQueryClient(queryHelper)
 
-	suite.key = key
 	suite.environment = env
 	suite.maccPerms = maccPerms
 	suite.accountNumberLanes = 1
@@ -261,13 +260,13 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccountInfo() {
 }
 
 func (suite *DeterministicTestSuite) createAndReturnQueryClient(ak keeper.AccountKeeper) types.QueryClient {
-	queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.encCfg.InterfaceRegistry)
+	queryHelper := queryclient.NewQueryHelper(codec.NewProtoCodec(suite.encCfg.InterfaceRegistry).GRPCCodec())
 	types.RegisterQueryServer(queryHelper, keeper.NewQueryServer(ak))
 	return types.NewQueryClient(queryHelper)
 }
 
 func (suite *DeterministicTestSuite) setModuleAccounts(
-	ctx sdk.Context, ak keeper.AccountKeeper, maccs []string,
+	ctx context.Context, ak keeper.AccountKeeper, maccs []string,
 ) []sdk.AccountI {
 	sort.Strings(maccs)
 	moduleAccounts := make([]sdk.AccountI, 0, len(maccs))

x/auth/keeper/grpc_query_test.go

@@ -509,7 +509,7 @@ func (suite *KeeperTestSuite) TestQueryAccountInfo() {
 	suite.Require().NoError(acc.SetSequence(10))
 	suite.accountKeeper.SetAccount(suite.ctx, acc)
 
-	res, err := suite.queryClient.AccountInfo(context.Background(), &types.QueryAccountInfoRequest{
+	res, err := suite.queryClient.AccountInfo(suite.ctx, &types.QueryAccountInfoRequest{
 		Address: addr.String(),
 	})
 
@@ -528,7 +528,7 @@ func (suite *KeeperTestSuite) TestQueryAccountInfoWithoutPubKey() {
 	acc := suite.accountKeeper.NewAccountWithAddress(suite.ctx, addr)
 	suite.accountKeeper.SetAccount(suite.ctx, acc)
 
-	res, err := suite.queryClient.AccountInfo(context.Background(), &types.QueryAccountInfoRequest{
+	res, err := suite.queryClient.AccountInfo(suite.ctx, &types.QueryAccountInfoRequest{
 		Address: addr.String(),
 	})
 

x/auth/keeper/keeper_test.go

@@ -9,16 +9,13 @@ import (
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/mock/gomock"
 
-	"cosmossdk.io/core/header"
 	coretesting "cosmossdk.io/core/testing"
-	storetypes "cosmossdk.io/store/types"
+	"cosmossdk.io/core/testing/queryclient"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
+	"github.com/cosmos/cosmos-sdk/codec"
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
-	"github.com/cosmos/cosmos-sdk/runtime"
-	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -42,7 +39,7 @@ var (
 type KeeperTestSuite struct {
 	suite.Suite
 
-	ctx sdk.Context
+	ctx context.Context
 
 	queryClient    types.QueryClient
 	accountKeeper  keeper.AccountKeeper
@@ -54,11 +51,11 @@ type KeeperTestSuite struct {
 func (suite *KeeperTestSuite) SetupTest() {
 	suite.encCfg = moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}, auth.AppModule{})
 
-	key := storetypes.NewKVStoreKey(types.StoreKey)
-	storeService := runtime.NewKVStoreService(key)
-	env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
-	testCtx := testutil.DefaultContextWithDB(suite.T(), key, storetypes.NewTransientStoreKey("transient_test"))
-	suite.ctx = testCtx.Ctx.WithHeaderInfo(header.Info{})
+	ctx, env := coretesting.NewTestEnvironment(coretesting.TestEnvironmentConfig{
+		ModuleName: types.ModuleName,
+		Logger:     coretesting.NewNopLogger(),
+	})
+	suite.ctx = ctx
 
 	// gomock initializations
 	ctrl := gomock.NewController(suite.T())
@@ -81,7 +78,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 	}
 
 	suite.accountKeeper = keeper.NewAccountKeeper(
-		env,
+		env.Environment,
 		suite.encCfg.Codec,
 		types.ProtoBaseAccount,
 		acctsModKeeper,
@@ -91,7 +88,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 		types.NewModuleAddress("gov").String(),
 	)
 	suite.msgServer = keeper.NewMsgServerImpl(suite.accountKeeper)
-	queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.encCfg.InterfaceRegistry)
+	queryHelper := queryclient.NewQueryHelper(codec.NewProtoCodec(suite.encCfg.InterfaceRegistry).GRPCCodec())
 	types.RegisterQueryServer(queryHelper, keeper.NewQueryServer(suite.accountKeeper))
 	suite.queryClient = types.NewQueryClient(queryHelper)
 }

x/auth/tx/config/depinject.go

@@ -17,10 +17,8 @@ import (
 	txsigning "cosmossdk.io/x/tx/signing"
 	"cosmossdk.io/x/tx/signing/textual"
 
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 )
 
@@ -49,7 +47,6 @@ type ModuleInputs struct {
 type ModuleOutputs struct {
 	depinject.Out
 
-	BaseAppOption       runtime.BaseAppOption // This is only useful for chains using baseapp.
 	TxConfig            client.TxConfig
 	TxConfigOptions     tx.ConfigOptions
 	TxSigningHandlerMap *txsigning.HandlerMap
@@ -86,10 +83,6 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 	}
 
 	return ModuleOutputs{
-		BaseAppOption: func(app *baseapp.BaseApp) {
-			app.SetTxDecoder(txConfig.TxDecoder())
-			app.SetTxEncoder(txConfig.TxEncoder())
-		},
 		TxConfig:            txConfig,
 		TxConfigOptions:     txConfigOptions,
 		TxSigningHandlerMap: txConfig.SignModeHandler(),

x/circuit/go.mod

@@ -159,7 +159,10 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/cosmos/cosmos-sdk => ../../.
+replace (
+	cosmossdk.io/core/testing => ../../core/testing
+	github.com/cosmos/cosmos-sdk => ../../.
+)
 
 // TODO remove post spinning out all modules
 replace (

x/circuit/go.sum

@@ -10,8 +10,6 @@ cosmossdk.io/collections v1.1.0 h1:UgfDUtQbRcA6uTrwd4Z6lhxMWhHPUTneXCHkWztyvMM=
 cosmossdk.io/collections v1.1.0/go.mod h1:D2iuLsFTDseILML+2rCnWIRFyFgl5cyveZ6kNTQALd4=
 cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U=
 cosmossdk.io/core v1.0.0/go.mod h1:mKIp3RkoEmtqdEdFHxHwWAULRe+79gfdOvmArrLDbDc=
-cosmossdk.io/core/testing v0.0.1 h1:gYCTaftcRrz+HoNXmK7r9KgbG1jgBJ8pNzm/Pa/erFQ=
-cosmossdk.io/core/testing v0.0.1/go.mod h1:2VDNz/25qtxgPa0+j8LW5e8Ev/xObqoJA7QuJS9/wIQ=
 cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E=
 cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=

x/upgrade/go.mod

@@ -13,7 +13,6 @@ require (
 	cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
 	cosmossdk.io/x/tx v1.1.0
 	github.com/cometbft/cometbft v1.0.0
-	github.com/cometbft/cometbft/api v1.0.0
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.53.0
 	github.com/cosmos/gogoproto v1.7.0
@@ -70,6 +69,7 @@ require (
 	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cometbft/cometbft-db v1.0.1 // indirect
+	github.com/cometbft/cometbft/api v1.0.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/iavl v1.3.4 // indirect
@@ -196,7 +196,10 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/cosmos/cosmos-sdk => ../../.
+replace (
+	cosmossdk.io/core/testing => ../../core/testing
+	github.com/cosmos/cosmos-sdk => ../../.
+)
 
 replace (
 	cosmossdk.io/client/v2 => ../../client/v2

x/upgrade/go.sum

@@ -616,8 +616,6 @@ cosmossdk.io/collections v1.1.0 h1:UgfDUtQbRcA6uTrwd4Z6lhxMWhHPUTneXCHkWztyvMM=
 cosmossdk.io/collections v1.1.0/go.mod h1:D2iuLsFTDseILML+2rCnWIRFyFgl5cyveZ6kNTQALd4=
 cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U=
 cosmossdk.io/core v1.0.0/go.mod h1:mKIp3RkoEmtqdEdFHxHwWAULRe+79gfdOvmArrLDbDc=
-cosmossdk.io/core/testing v0.0.1 h1:gYCTaftcRrz+HoNXmK7r9KgbG1jgBJ8pNzm/Pa/erFQ=
-cosmossdk.io/core/testing v0.0.1/go.mod h1:2VDNz/25qtxgPa0+j8LW5e8Ev/xObqoJA7QuJS9/wIQ=
 cosmossdk.io/depinject v1.1.0 h1:wLan7LG35VM7Yo6ov0jId3RHWCGRhe8E8bsuARorl5E=
 cosmossdk.io/depinject v1.1.0/go.mod h1:kkI5H9jCGHeKeYWXTqYdruogYrEeWvBQCw1Pj4/eCFI=
 cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=