From 0f3d58da4b080a7f4c9185c5fb5f312c350ec9dd Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Sat, 22 Jul 2023 02:37:56 -0500
Subject: [PATCH 1/2] fix: testutil/configurator: correctly create fresh copy
 of defaultConfig (#17089)

(cherry picked from commit 0fa85b7a424d78bfa1703ceb2e245c0bb4bcda22)

# Conflicts:
#	testutil/configurator/configurator.go
---
 testutil/configurator/configurator.go | 73 ++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/testutil/configurator/configurator.go b/testutil/configurator/configurator.go
index fff796610bc7..e032ca7529c4 100644
--- a/testutil/configurator/configurator.go
+++ b/testutil/configurator/configurator.go
@@ -33,6 +33,7 @@ type Config struct {
 	setInitGenesis     bool
 }
 
+<<<<<<< HEAD
 var defaultConfig = &Config{
 	ModuleConfigs: make(map[string]*appv1alpha1.ModuleConfig),
 	BeginBlockersOrder: []string{
@@ -96,6 +97,76 @@ var defaultConfig = &Config{
 		"vesting",
 	},
 	setInitGenesis: true,
+=======
+func defaultConfig() *Config {
+	return &Config{
+		ModuleConfigs: make(map[string]*appv1alpha1.ModuleConfig),
+		BeginBlockersOrder: []string{
+			"upgrade",
+			"mint",
+			"distribution",
+			"slashing",
+			"evidence",
+			"staking",
+			"auth",
+			"bank",
+			"gov",
+			"crisis",
+			"genutil",
+			"authz",
+			"feegrant",
+			"nft",
+			"group",
+			"params",
+			"consensus",
+			"vesting",
+			"circuit",
+		},
+		EndBlockersOrder: []string{
+			"crisis",
+			"gov",
+			"staking",
+			"auth",
+			"bank",
+			"distribution",
+			"slashing",
+			"mint",
+			"genutil",
+			"evidence",
+			"authz",
+			"feegrant",
+			"nft",
+			"group",
+			"params",
+			"consensus",
+			"upgrade",
+			"vesting",
+			"circuit",
+		},
+		InitGenesisOrder: []string{
+			"auth",
+			"bank",
+			"distribution",
+			"staking",
+			"slashing",
+			"gov",
+			"mint",
+			"crisis",
+			"genutil",
+			"evidence",
+			"authz",
+			"feegrant",
+			"nft",
+			"group",
+			"params",
+			"consensus",
+			"upgrade",
+			"vesting",
+			"circuit",
+		},
+		setInitGenesis: true,
+	}
+>>>>>>> 0fa85b7a4 (fix: testutil/configurator: correctly create fresh copy of defaultConfig (#17089))
 }
 
 type ModuleOption func(config *Config)
@@ -295,7 +366,7 @@ func OmitInitGenesis() ModuleOption {
 }
 
 func NewAppConfig(opts ...ModuleOption) depinject.Config {
-	cfg := defaultConfig
+	cfg := defaultConfig()
 	for _, opt := range opts {
 		opt(cfg)
 	}

From f7d4e92a855a252cd2b3c4980f2d8bab6171d57c Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Sun, 23 Jul 2023 22:43:50 +0200
Subject: [PATCH 2/2] fix conflicts

---
 testutil/configurator/configurator.go | 69 ---------------------------
 1 file changed, 69 deletions(-)

diff --git a/testutil/configurator/configurator.go b/testutil/configurator/configurator.go
index e032ca7529c4..117260d54a1d 100644
--- a/testutil/configurator/configurator.go
+++ b/testutil/configurator/configurator.go
@@ -33,71 +33,6 @@ type Config struct {
 	setInitGenesis     bool
 }
 
-<<<<<<< HEAD
-var defaultConfig = &Config{
-	ModuleConfigs: make(map[string]*appv1alpha1.ModuleConfig),
-	BeginBlockersOrder: []string{
-		"upgrade",
-		"mint",
-		"distribution",
-		"slashing",
-		"evidence",
-		"staking",
-		"auth",
-		"bank",
-		"gov",
-		"crisis",
-		"genutil",
-		"authz",
-		"feegrant",
-		"nft",
-		"group",
-		"params",
-		"consensus",
-		"vesting",
-	},
-	EndBlockersOrder: []string{
-		"crisis",
-		"gov",
-		"staking",
-		"auth",
-		"bank",
-		"distribution",
-		"slashing",
-		"mint",
-		"genutil",
-		"evidence",
-		"authz",
-		"feegrant",
-		"nft",
-		"group",
-		"params",
-		"consensus",
-		"upgrade",
-		"vesting",
-	},
-	InitGenesisOrder: []string{
-		"auth",
-		"bank",
-		"distribution",
-		"staking",
-		"slashing",
-		"gov",
-		"mint",
-		"crisis",
-		"genutil",
-		"evidence",
-		"authz",
-		"feegrant",
-		"nft",
-		"group",
-		"params",
-		"consensus",
-		"upgrade",
-		"vesting",
-	},
-	setInitGenesis: true,
-=======
 func defaultConfig() *Config {
 	return &Config{
 		ModuleConfigs: make(map[string]*appv1alpha1.ModuleConfig),
@@ -120,7 +55,6 @@ func defaultConfig() *Config {
 			"params",
 			"consensus",
 			"vesting",
-			"circuit",
 		},
 		EndBlockersOrder: []string{
 			"crisis",
@@ -141,7 +75,6 @@ func defaultConfig() *Config {
 			"consensus",
 			"upgrade",
 			"vesting",
-			"circuit",
 		},
 		InitGenesisOrder: []string{
 			"auth",
@@ -162,11 +95,9 @@ func defaultConfig() *Config {
 			"consensus",
 			"upgrade",
 			"vesting",
-			"circuit",
 		},
 		setInitGenesis: true,
 	}
->>>>>>> 0fa85b7a4 (fix: testutil/configurator: correctly create fresh copy of defaultConfig (#17089))
 }
 
 type ModuleOption func(config *Config)