From ee05d7da63ab218a1e4f61619fe1a6cd3aa32729 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 17 Jun 2022 17:39:44 +0200
Subject: [PATCH] feat: migrate `x/distribution` to use app wiring (#12294)

---
 app.go   | 8 +-------
 app.yaml | 6 +++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app.go b/app.go
index 25724263dd13..0f4c85361212 100644
--- a/app.go
+++ b/app.go
@@ -226,6 +226,7 @@ func NewSimApp(
 		&app.SlashingKeeper,
 		&app.MintKeeper,
 		&app.EvidenceKeeper,
+		&app.DistrKeeper,
 	); err != nil {
 		panic(err)
 	}
@@ -233,7 +234,6 @@ func NewSimApp(
 	app.App = appBuilder.Build(logger, db, traceStore, baseAppOptions...)
 
 	app.keys = sdk.NewKVStoreKeys(
-		distrtypes.StoreKey,
 		govtypes.StoreKey,
 		upgradetypes.StoreKey,
 	)
@@ -246,10 +246,6 @@ func NewSimApp(
 
 	initParamsKeeper(app.ParamsKeeper)
 
-	app.DistrKeeper = distrkeeper.NewKeeper(
-		app.appCodec, app.keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
-		app.StakingKeeper, authtypes.FeeCollectorName,
-	)
 	app.CrisisKeeper = crisiskeeper.NewKeeper(
 		app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName,
 	)
@@ -294,7 +290,6 @@ func NewSimApp(
 		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
 		gov.NewAppModule(app.appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
-		distr.NewAppModule(app.appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
 		upgrade.NewAppModule(app.UpgradeKeeper),
 	); err != nil {
 		panic(err)
@@ -451,7 +446,6 @@ func GetMaccPerms() map[string][]string {
 
 // initParamsKeeper init params keeper and its subspaces
 func initParamsKeeper(paramsKeeper paramskeeper.Keeper) {
-	paramsKeeper.Subspace(distrtypes.ModuleName)
 	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable())
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 }
diff --git a/app.yaml b/app.yaml
index b224655e97d7..44df3e25bda3 100644
--- a/app.yaml
+++ b/app.yaml
@@ -109,7 +109,7 @@ modules:
       "@type": cosmos.group.v1.module.v1.Module
       max_metadata_len: 255
       max_execution_period: "1209600s"
-      
+
   - name: nft
     config:
       "@type": cosmos.nft.module.v1.Module
@@ -129,3 +129,7 @@ modules:
   - name: evidence
     config:
       "@type": cosmos.evidence.module.v1.Module
+
+  - name: distribution
+    config:
+      "@type": cosmos.distribution.module.v1.Module