refactor: move UpgradeModule interface to appmodule and fix mocks (#17383)

Co-authored-by: Marko <marko@baricevic.me>

types/module/mock_appmodule_test.go

@@ -15,6 +15,7 @@ type AppModuleWithAllExtensions interface {
 	module.HasInvariants
 	module.HasConsensusVersion
 	module.HasABCIEndblock
+	module.HasName
 }
 
 // CoreAppModule is solely here for the purpose of generating
@@ -27,3 +28,8 @@ type CoreAppModule interface {
 	appmodule.HasPrecommit
 	appmodule.HasPrepareCheckState
 }
+
+type CoreUpgradeAppModule interface {
+	CoreAppModule
+	appmodule.UpgradeModule
+}

types/module/module.go

@@ -36,7 +36,7 @@ import (
 	"sort"
 
 	abci "github.com/cometbft/cometbft/abci/types"
-	gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/maps"
 
@@ -57,7 +57,7 @@ type AppModuleBasic interface {
 	HasName
 	RegisterLegacyAminoCodec(*codec.LegacyAmino)
 	RegisterInterfaces(types.InterfaceRegistry)
-	RegisterGRPCGatewayRoutes(client.Context, *gwruntime.ServeMux)
+	RegisterGRPCGatewayRoutes(client.Context, *runtime.ServeMux)
 }
 
 // HasName allows the module to provide its own name for legacy purposes.
@@ -67,13 +67,6 @@ type HasName interface {
 	Name() string
 }
 
-// UpgradeModule is the extension interface that upgrade module should implement to differentiate
-// it from other modules, migration handler need ensure the upgrade module's migration is executed
-// before the rest of the modules.
-type UpgradeModule interface {
-	IsUpgradeModule()
-}
-
 // HasGenesisBasics is the legacy interface for stateless genesis methods.
 type HasGenesisBasics interface {
 	DefaultGenesis(codec.JSONCodec) json.RawMessage
@@ -157,7 +150,7 @@ func (bm BasicManager) ValidateGenesis(cdc codec.JSONCodec, txEncCfg client.TxEn
 }
 
 // RegisterGRPCGatewayRoutes registers all module rest routes
-func (bm BasicManager) RegisterGRPCGatewayRoutes(clientCtx client.Context, rtr *gwruntime.ServeMux) {
+func (bm BasicManager) RegisterGRPCGatewayRoutes(clientCtx client.Context, rtr *runtime.ServeMux) {
 	for _, b := range bm {
 		b.RegisterGRPCGatewayRoutes(clientCtx, rtr)
 	}
@@ -709,7 +702,7 @@ func (m Manager) RunMigrations(ctx context.Context, cfg Configurator, fromVM Ver
 func (m *Manager) RunMigrationBeginBlock(ctx sdk.Context) (bool, error) {
 	for _, moduleName := range m.OrderBeginBlockers {
 		if mod, ok := m.Modules[moduleName].(appmodule.HasBeginBlocker); ok {
-			if _, ok := mod.(UpgradeModule); ok {
+			if _, ok := mod.(appmodule.UpgradeModule); ok {
 				err := mod.BeginBlock(ctx)
 				return err == nil, err
 			}
@@ -725,7 +718,7 @@ func (m *Manager) BeginBlock(ctx sdk.Context) (sdk.BeginBlock, error) {
 	ctx = ctx.WithEventManager(sdk.NewEventManager())
 	for _, moduleName := range m.OrderBeginBlockers {
 		if module, ok := m.Modules[moduleName].(appmodule.HasBeginBlocker); ok {
-			if _, ok := module.(UpgradeModule); !ok {
+			if _, ok := module.(appmodule.UpgradeModule); !ok {
 				if err := module.BeginBlock(ctx); err != nil {
 					return sdk.BeginBlock{}, err
 				}

types/module/module_test.go

@@ -472,7 +472,7 @@ func TestCoreAPIManager_RunMigrationBeginBlock(t *testing.T) {
 	t.Cleanup(mockCtrl.Finish)
 
 	mockAppModule1 := mock.NewMockCoreAppModule(mockCtrl)
-	mockAppModule2 := mock.NewMockUpgradeModule(mockCtrl)
+	mockAppModule2 := mock.NewMockCoreUpgradeAppModule(mockCtrl)
 	mm := module.NewManagerFromMap(map[string]appmodule.AppModule{
 		"module1": mockAppModule1,
 		"module2": mockAppModule2,