refactor: use appmodule.AppModule in integration helpers (#16755)

testutil/integration/example_test.go

@@ -7,6 +7,7 @@ import (
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/google/go-cmp/cmp"
 
+	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
 
@@ -63,7 +64,10 @@ func Example() {
 		logger,
 		keys,
 		encodingCfg.Codec,
-		authModule, mintModule,
+		map[string]appmodule.AppModule{
+			authtypes.ModuleName: authModule,
+			minttypes.ModuleName: mintModule,
+		},
 	)
 
 	// register the message and query servers
@@ -144,7 +148,9 @@ func Example_oneModule() {
 		logger,
 		keys,
 		encodingCfg.Codec,
-		authModule,
+		map[string]appmodule.AppModule{
+			authtypes.ModuleName: authModule,
+		},
 	)
 
 	// register the message and query servers

testutil/integration/router.go

@@ -8,6 +8,7 @@ import (
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	dbm "github.com/cosmos/cosmos-db"
 
+	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/log"
 	"cosmossdk.io/store"
 	"cosmossdk.io/store/metrics"
@@ -45,14 +46,14 @@ func NewIntegrationApp(
 	logger log.Logger,
 	keys map[string]*storetypes.KVStoreKey,
 	appCodec codec.Codec,
-	modules ...module.AppModule,
+	modules map[string]appmodule.AppModule,
 ) *App {
 	db := dbm.NewMemDB()
 
 	interfaceRegistry := codectypes.NewInterfaceRegistry()
-	for _, module := range modules {
-		module.RegisterInterfaces(interfaceRegistry)
-	}
+	moduleManager := module.NewManagerFromMap(modules)
+	basicModuleManager := module.NewBasicManagerFromManager(moduleManager, nil)
+	basicModuleManager.RegisterInterfaces(interfaceRegistry)
 
 	txConfig := authtx.NewTxConfig(codec.NewProtoCodec(interfaceRegistry), authtx.DefaultSignModes)
 	bApp := baseapp.NewBaseApp(appName, logger, db, txConfig.TxDecoder(), baseapp.SetChainID(appName))
@@ -68,7 +69,6 @@ func NewIntegrationApp(
 		return &cmtabcitypes.ResponseInitChain{}, nil
 	})
 
-	moduleManager := module.NewManager(modules...)
 	bApp.SetBeginBlocker(func(_ sdk.Context) (sdk.BeginBlock, error) {
 		return moduleManager.BeginBlock(sdkCtx)
 	})