fix: adjust keeper init sequence of gov & farm

irisnet · Sep 27, 2023 · 3de5405 · 3de5405
1 parent 9439b1c
commit 3de5405
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/app/app.go b/app/app.go
@@ -597,6 +597,18 @@ func NewIrisApp(
 		app.ServiceKeeper,
 	)
 
+	govConfig := govtypes.DefaultConfig()
+	app.GovKeeper = govkeeper.NewKeeper(
+		appCodec,
+		keys[govtypes.StoreKey],
+		app.AccountKeeper,
+		app.BankKeeper,
+		app.StakingKeeper,
+		app.MsgServiceRouter(),
+		govConfig,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	app.FarmKeeper = farmkeeper.NewKeeper(appCodec,
 		keys[farmtypes.StoreKey],
 		app.BankKeeper,
@@ -618,18 +630,6 @@ func NewIrisApp(
 		AddRoute(tibchost.RouterKey, tibccli.NewProposalHandler(app.TIBCKeeper)).
 		AddRoute(farmtypes.RouterKey, farm.NewCommunityPoolCreateFarmProposalHandler(app.FarmKeeper))
 
-	govConfig := govtypes.DefaultConfig()
-	app.GovKeeper = govkeeper.NewKeeper(
-		appCodec,
-		keys[govtypes.StoreKey],
-		app.AccountKeeper,
-		app.BankKeeper,
-		app.StakingKeeper,
-		app.MsgServiceRouter(),
-		govConfig,
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-
 	app.GovKeeper.SetHooks(govtypes.NewMultiGovHooks(
 		farmkeeper.NewGovHook(app.FarmKeeper),
 	))