From 9002356b85dd0745a7b38f0ac6f3255772d4010d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 16 Feb 2022 18:15:34 -0600
Subject: [PATCH] Move app.setupUpgradeHandlers() after module manager and
 configurator (#884) (#885)

(cherry picked from commit 5cfdfbaf49db7a0a881de6cd52f4fffc8091f33a)

Co-authored-by: Unity Chaos <86889904+UnityChaos@users.noreply.github.com>
---
 app/app.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/app.go b/app/app.go
index 8f563197407..4727659edee 100644
--- a/app/app.go
+++ b/app/app.go
@@ -301,7 +301,6 @@ func NewOsmosisApp(
 	app.setupUpgradeStoreLoaders()
 	app.InitNormalKeepers()
 	app.SetupHooks()
-	app.setupUpgradeHandlers()
 
 	/****  Module Options ****/
 
@@ -395,6 +394,8 @@ func NewOsmosisApp(
 	app.configurator = module.NewConfigurator(app.AppCodec(), app.MsgServiceRouter(), app.GRPCQueryRouter())
 	app.mm.RegisterServices(app.configurator)
 
+	app.setupUpgradeHandlers()
+
 	// create the simulation manager and define the order of the modules for deterministic simulations
 	//
 	// NOTE: this is not required apps that don't use the simulator for fuzz testing