From 9fd7f3ab6018628e637d8263af208e7ca39b7660 Mon Sep 17 00:00:00 2001
From: Sachin Kamath <github@skamath.me>
Date: Thu, 23 Jan 2025 15:18:16 +0530
Subject: [PATCH] rename upgrades for clarity

---
 app/upgrades.go                                   |  4 ++--
 .../{v054-doubledip => v054-testnet}/upgrades.go  | 15 +++++++--------
 app/upgrades/v054/upgrades.go                     | 11 ++++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename app/upgrades/{v054-doubledip => v054-testnet}/upgrades.go (95%)

diff --git a/app/upgrades.go b/app/upgrades.go
index afb5b6c9..b4ddd181 100644
--- a/app/upgrades.go
+++ b/app/upgrades.go
@@ -8,11 +8,11 @@ import (
 	"github.com/nymtech/nyxd/app/upgrades"
 	"github.com/nymtech/nyxd/app/upgrades/noop"
 	v054 "github.com/nymtech/nyxd/app/upgrades/v054"
-	v054doubledip "github.com/nymtech/nyxd/app/upgrades/v054-doubledip"
+	v054testnet "github.com/nymtech/nyxd/app/upgrades/v054-testnet"
 )
 
 // Upgrades list of chain upgrades
-var Upgrades = []upgrades.Upgrade{v054doubledip.Upgrade, v054.Upgrade}
+var Upgrades = []upgrades.Upgrade{v054testnet.Upgrade, v054.Upgrade}
 
 // RegisterUpgradeHandlers registers the chain upgrade handlers
 func (app *WasmApp) RegisterUpgradeHandlers() {
diff --git a/app/upgrades/v054-doubledip/upgrades.go b/app/upgrades/v054-testnet/upgrades.go
similarity index 95%
rename from app/upgrades/v054-doubledip/upgrades.go
rename to app/upgrades/v054-testnet/upgrades.go
index 8d1eab2a..dee4b94f 100644
--- a/app/upgrades/v054-doubledip/upgrades.go
+++ b/app/upgrades/v054-testnet/upgrades.go
@@ -1,31 +1,28 @@
-package v054doubledip
+package v054testnet
 
 import (
 	"context"
 	"fmt"
+	"time"
 
 	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
-	circuittypes "cosmossdk.io/x/circuit/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 
 	"github.com/nymtech/nyxd/app/upgrades"
 )
 
 // UpgradeName defines the on-chain upgrade name
-const UpgradeName = "v0.54-doubledip"
+const UpgradeName = "v0.54-testnet"
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: storetypes.StoreUpgrades{
-		Added: []string{
-			circuittypes.ModuleName,
-		},
+		Added:   []string{},
 		Deleted: []string{},
 	},
 }
@@ -117,6 +114,8 @@ func CreateUpgradeHandler(
 		depositDenom, depositAmount := govParams.MinDeposit[0].Denom, govParams.MinDeposit[0].Amount.Mul(sdkmath.NewInt(5))
 		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewInt64Coin(depositDenom, depositAmount.Int64()))
 		govParams.ProposalCancelRatio = sdkmath.LegacyZeroDec().String()
+		expeditedPeriod := time.Duration(govParams.VotingPeriod.Seconds() / 2)
+		govParams.ExpeditedVotingPeriod = &expeditedPeriod
 
 		ok := ak.GovKeeper.Params.Set(ctx, govParams)
 
diff --git a/app/upgrades/v054/upgrades.go b/app/upgrades/v054/upgrades.go
index b8c3e224..80e71a4b 100644
--- a/app/upgrades/v054/upgrades.go
+++ b/app/upgrades/v054/upgrades.go
@@ -3,14 +3,15 @@ package v054
 import (
 	"context"
 	"fmt"
-	"time"
 
 	sdkmath "cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
+	circuittypes "cosmossdk.io/x/circuit/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 
 	"github.com/nymtech/nyxd/app/upgrades"
 )
@@ -22,7 +23,9 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: storetypes.StoreUpgrades{
-		Added:   []string{},
+		Added: []string{
+			circuittypes.ModuleName,
+		},
 		Deleted: []string{},
 	},
 }
@@ -114,8 +117,6 @@ func CreateUpgradeHandler(
 		depositDenom, depositAmount := govParams.MinDeposit[0].Denom, govParams.MinDeposit[0].Amount.Mul(sdkmath.NewInt(5))
 		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewInt64Coin(depositDenom, depositAmount.Int64()))
 		govParams.ProposalCancelRatio = sdkmath.LegacyZeroDec().String()
-		expeditedPeriod := time.Duration(govParams.VotingPeriod.Seconds() / 2)
-		govParams.ExpeditedVotingPeriod = &expeditedPeriod
 
 		ok := ak.GovKeeper.Params.Set(ctx, govParams)