From b357073b9a3bc7d8ade67a543a8b10801f969737 Mon Sep 17 00:00:00 2001
From: Reece Williams <reecepbcups@gmail.com>
Date: Mon, 3 Apr 2023 12:19:50 -0500
Subject: [PATCH] Remove temp upgradeHandler for Uni

---
 app/app.go                            |  3 +--
 app/upgrades/univ14part2/constants.go | 15 ---------------
 app/upgrades/univ14part2/upgrades.go  | 22 ----------------------
 3 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 app/upgrades/univ14part2/constants.go
 delete mode 100644 app/upgrades/univ14part2/upgrades.go

diff --git a/app/app.go b/app/app.go
index 5caf95a96..b5602a7a8 100644
--- a/app/app.go
+++ b/app/app.go
@@ -58,7 +58,6 @@ import (
 	"github.com/CosmosContracts/juno/v14/app/keepers"
 	encparams "github.com/CosmosContracts/juno/v14/app/params"
 	upgrades "github.com/CosmosContracts/juno/v14/app/upgrades"
-	univ14part2 "github.com/CosmosContracts/juno/v14/app/upgrades/univ14part2"
 	v10 "github.com/CosmosContracts/juno/v14/app/upgrades/v10"
 	v11 "github.com/CosmosContracts/juno/v14/app/upgrades/v11"
 	v12 "github.com/CosmosContracts/juno/v14/app/upgrades/v12"
@@ -84,7 +83,7 @@ var (
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
 
-	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, univ14part2.Upgrade, v14.Upgrade}
+	Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade}
 )
 
 // These constants are derived from the above variables.
diff --git a/app/upgrades/univ14part2/constants.go b/app/upgrades/univ14part2/constants.go
deleted file mode 100644
index 9f087fa77..000000000
--- a/app/upgrades/univ14part2/constants.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package univ14part2
-
-import (
-	"github.com/CosmosContracts/juno/v14/app/upgrades"
-	store "github.com/cosmos/cosmos-sdk/store/types"
-)
-
-// Temp
-const UpgradeName = "v14part2"
-
-var Upgrade = upgrades.Upgrade{
-	UpgradeName:          UpgradeName,
-	CreateUpgradeHandler: CreateV14Part2UniUpgradeHandler,
-	StoreUpgrades:        store.StoreUpgrades{},
-}
diff --git a/app/upgrades/univ14part2/upgrades.go b/app/upgrades/univ14part2/upgrades.go
deleted file mode 100644
index 5aa26e3af..000000000
--- a/app/upgrades/univ14part2/upgrades.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package univ14part2
-
-import (
-	"github.com/CosmosContracts/juno/v14/app/keepers"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-)
-
-// Basic migration just to ensure all our small non state breaking changes
-// do not end up causing app hashing issues :) purely for safety on testnet
-func CreateV14Part2UniUpgradeHandler(
-	mm *module.Manager,
-	cfg module.Configurator,
-	_ *keepers.AppKeepers,
-) upgradetypes.UpgradeHandler {
-	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		return mm.RunMigrations(ctx, cfg, vm)
-	}
-}