From 0fa85b7a424d78bfa1703ceb2e245c0bb4bcda22 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] fix: testutil/configurator: correctly create fresh copy of
 defaultConfig (#17089)

---
 testutil/configurator/configurator.go | 136 +++++++++++++-------------
 1 file changed, 69 insertions(+), 67 deletions(-)

diff --git a/testutil/configurator/configurator.go b/testutil/configurator/configurator.go
index b63bd78c8fab..bec4da0f9685 100644
--- a/testutil/configurator/configurator.go
+++ b/testutil/configurator/configurator.go
@@ -34,72 +34,74 @@ type Config struct {
 	setInitGenesis     bool
 }
 
-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",
-		"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,
+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,
+	}
 }
 
 type ModuleOption func(config *Config)
@@ -308,7 +310,7 @@ func OmitInitGenesis() ModuleOption {
 }
 
 func NewAppConfig(opts ...ModuleOption) depinject.Config {
-	cfg := defaultConfig
+	cfg := defaultConfig()
 	for _, opt := range opts {
 		opt(cfg)
 	}