From 17ba80df7ca9e275910fb581766d47f068cd861f Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Tue, 28 Feb 2023 12:40:16 +0100
Subject: [PATCH] chore: use message router interface (#15213)

---
 CHANGELOG.md             | 2 +-
 x/gov/keeper/keeper.go   | 2 +-
 x/gov/module.go          | 2 +-
 x/group/module/module.go | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 521115ff85c5..8cf1a62c312a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -147,7 +147,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#14406](https://github.com/cosmos/cosmos-sdk/issues/14406) Migrate usage of types/store.go to store/types/..
 * (x/staking) [#14590](https://github.com/cosmos/cosmos-sdk/pull/14590) Return undelegate amount in MsgUndelegateResponse
 * (cli) [#14953](https://github.com/cosmos/cosmos-sdk/pull/14953) Enable profiling block replay during abci handshake with `--cpu-profile`.
-* (baseapp) [#15023](https://github.com/cosmos/cosmos-sdk/pull/15023) Add `MessageRouter` interface to baseapp and pass it to authz instead of concrete type. 
+* (baseapp) [#15023](https://github.com/cosmos/cosmos-sdk/pull/15023) & [#15213](https://github.com/cosmos/cosmos-sdk/pull/15213) Add `MessageRouter` interface to baseapp and pass it to authz, gov and groups instead of concrete type. 
 
 ### State Machine Breaking
 
diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go
index d717bce14596..399a4179fc8f 100644
--- a/x/gov/keeper/keeper.go
+++ b/x/gov/keeper/keeper.go
@@ -61,7 +61,7 @@ func (k Keeper) GetAuthority() string {
 func NewKeeper(
 	cdc codec.BinaryCodec, key storetypes.StoreKey, authKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper, sk types.StakingKeeper, distrkeeper types.DistributionKeeper,
-	router *baseapp.MsgServiceRouter, config types.Config, authority string,
+	router baseapp.MessageRouter, config types.Config, authority string,
 ) *Keeper {
 	// ensure governance module account is set
 	if addr := authKeeper.GetModuleAddress(types.ModuleName); addr == nil {
diff --git a/x/gov/module.go b/x/gov/module.go
index dcf5eafe64b5..c06da9eeb170 100644
--- a/x/gov/module.go
+++ b/x/gov/module.go
@@ -169,7 +169,7 @@ type GovInputs struct {
 	Cdc              codec.Codec
 	Key              *store.KVStoreKey
 	ModuleKey        depinject.OwnModuleKey
-	MsgServiceRouter *baseapp.MsgServiceRouter
+	MsgServiceRouter baseapp.MessageRouter
 
 	AccountKeeper      govtypes.AccountKeeper
 	BankKeeper         govtypes.BankKeeper
diff --git a/x/group/module/module.go b/x/group/module/module.go
index 4ab9af3cfc67..ba35298ade70 100644
--- a/x/group/module/module.go
+++ b/x/group/module/module.go
@@ -207,7 +207,7 @@ type GroupInputs struct {
 	AccountKeeper    group.AccountKeeper
 	BankKeeper       group.BankKeeper
 	Registry         cdctypes.InterfaceRegistry
-	MsgServiceRouter *baseapp.MsgServiceRouter
+	MsgServiceRouter baseapp.MessageRouter
 }
 
 type GroupOutputs struct {