chore: cleanup core/app (#21368)

simapp/v2/app_di.go

@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/viper"
 
 	clienthelpers "cosmossdk.io/client/v2/helpers"
-	coreapp "cosmossdk.io/core/app"
 	"cosmossdk.io/core/legacy"
+	"cosmossdk.io/core/server"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
@@ -212,7 +212,7 @@ func (app *SimApp[T]) AppCodec() codec.Codec {
 }
 
 // InterfaceRegistry returns SimApp's InterfaceRegistry.
-func (app *SimApp[T]) InterfaceRegistry() coreapp.InterfaceRegistry {
+func (app *SimApp[T]) InterfaceRegistry() server.InterfaceRegistry {
 	return app.interfaceRegistry
 }
 

simapp/v2/app_test.go

@@ -11,9 +11,9 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 
-	app2 "cosmossdk.io/core/app"
 	"cosmossdk.io/core/comet"
 	context2 "cosmossdk.io/core/context"
+	"cosmossdk.io/core/server"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/log"
@@ -80,7 +80,7 @@ func NewTestApp(t *testing.T) (*SimApp[transaction.Tx], context.Context) {
 
 	_, newState, err := app.InitGenesis(
 		ctx,
-		&app2.BlockRequest[transaction.Tx]{
+		&server.BlockRequest[transaction.Tx]{
 			Time:      time.Now(),
 			Hash:      bz[:],
 			ChainId:   "theChain",
@@ -123,7 +123,7 @@ func MoveNextBlock(t *testing.T, app *SimApp[transaction.Tx], ctx context.Contex
 
 	_, newState, err := app.DeliverBlock(
 		ctx,
-		&app2.BlockRequest[transaction.Tx]{
+		&server.BlockRequest[transaction.Tx]{
 			Height:  height + 1,
 			Time:    time.Now(),
 			Hash:    bz[:],