diff --git a/app/app.go b/app/app.go index 2f130e965..23fe2c009 100644 --- a/app/app.go +++ b/app/app.go @@ -164,8 +164,6 @@ import ( liquiditytypes "github.com/comdex-official/comdex/x/liquidity/types" cwasm "github.com/comdex-official/comdex/app/wasm" - - tv12 "github.com/comdex-official/comdex/app/upgrades/testnet/v12" ) const ( @@ -1219,14 +1217,6 @@ func (a *App) registerUpgradeHandlers() { panic(err) } - switch { - case upgradeInfo.Name == tv12.UpgradeName: - a.UpgradeKeeper.SetUpgradeHandler( - tv12.UpgradeName, - tv12.CreateUpgradeHandlerV12(a.mm, a.configurator), - ) - } - var storeUpgrades *storetypes.StoreUpgrades storeUpgrades = upgradeHandlers(upgradeInfo, a, storeUpgrades) @@ -1238,13 +1228,6 @@ func (a *App) registerUpgradeHandlers() { } func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *storetypes.StoreUpgrades) *storetypes.StoreUpgrades { - switch { - - case upgradeInfo.Name == tv12.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height): - storeUpgrades = &storetypes.StoreUpgrades{ - Added: []string{}, - } - } return storeUpgrades } \ No newline at end of file diff --git a/app/upgrades/testnet/v12/constants.go b/app/upgrades/testnet/v12/constants.go deleted file mode 100644 index 9ba6229ba..000000000 --- a/app/upgrades/testnet/v12/constants.go +++ /dev/null @@ -1,15 +0,0 @@ -package v12 - -const ( - UpgradeName = "v12.0.0" - UpgradeHeight = "" - UpgradeInfo = `'{ - "binaries": { - "darwin/arm64":"", - "darwin/x86_64":"", - "linux/arm64":"", - "linux/x86_64":"", - "windows/x86_64":"" - } - }'` -) diff --git a/app/upgrades/testnet/v12/upgrades.go b/app/upgrades/testnet/v12/upgrades.go deleted file mode 100644 index 80c53901f..000000000 --- a/app/upgrades/testnet/v12/upgrades.go +++ /dev/null @@ -1,18 +0,0 @@ -package v12 - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" -) - -func CreateUpgradeHandlerV12( - mm *module.Manager, - configurator module.Configurator, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - - ctx.Logger().Info("Applying test net upgrade - v.12.0.0") - return mm.RunMigrations(ctx, configurator, fromVM) - } -} diff --git a/cmd/comdex/migrate.go b/cmd/comdex/migrate.go index 006d70b95..5b76229ce 100644 --- a/cmd/comdex/migrate.go +++ b/cmd/comdex/migrate.go @@ -6,7 +6,6 @@ import ( packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types" ) -// Migrate migrates exported state from v0.40 to a v0.43 genesis state. func Migrate(appState types.AppMap, clientCtx client.Context) types.AppMap { // Migrate packetfowardmiddleware. if appState["packetfowardmiddleware"] != nil { diff --git a/cmd/comdex/migration.go b/cmd/comdex/migration.go index 63dea4e88..d8898e7b8 100644 --- a/cmd/comdex/migration.go +++ b/cmd/comdex/migration.go @@ -20,7 +20,7 @@ const flagGenesisTime = "genesis-time" const chainUpgradeGuide = "https://docs.cosmos.network/master/migrations/chain-upgrade-guide-040.html" var migrationMap = types.MigrationMap{ - "v12.0": Migrate, + "v11.1.0": Migrate, } // GetMigrationCallback returns a MigrationCallback for a given version. @@ -35,7 +35,7 @@ func MigrateStoreCmd() *cobra.Command { Long: fmt.Sprintf(`Migrate the source genesis into the target version and print to STDOUT. Example: -$ %s migrate v0.36 /path/to/genesis.json --chain-id=cosmoshub-3 --genesis-time=2019-04-22T17:00:00Z +$ %s migrate v11.1.0 /path/to/genesis.json --chain-id=test-2 --genesis-time=2019-04-22T17:00:00Z `, version.AppName), Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error {