Skip to content

Commit

Permalink
Merge pull request lavanet#629 from lavanet/upgrade_handler_v20_1
Browse files Browse the repository at this point in the history
upgrade 20.1 handler + removing testnet1 handlers from main
  • Loading branch information
Yaroms authored Jul 19, 2023
2 parents 394612b + a9bcf0b commit 26691d6
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 605 deletions.
42 changes: 1 addition & 41 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@ import (
"github.com/lavanet/lava/app/keepers"
appparams "github.com/lavanet/lava/app/params"
"github.com/lavanet/lava/app/upgrades"
"github.com/lavanet/lava/app/upgrades/v0_5_0"
"github.com/lavanet/lava/app/upgrades/v0_5_1"
"github.com/lavanet/lava/app/upgrades/v0_5_2"
"github.com/lavanet/lava/app/upgrades/v0_9_1"
"github.com/lavanet/lava/app/upgrades/v0_9_6"
"github.com/lavanet/lava/app/upgrades/v0_9_7"
"github.com/lavanet/lava/app/upgrades/v0_9_8"
"github.com/lavanet/lava/docs"
conflictmodule "github.com/lavanet/lava/x/conflict"
conflictmodulekeeper "github.com/lavanet/lava/x/conflict/keeper"
Expand Down Expand Up @@ -136,40 +129,7 @@ const (

// Upgrades add here future upgrades (upgrades.Upgrade)
var Upgrades = []upgrades.Upgrade{
upgrades.Upgrade_0_4_0,
upgrades.Upgrade_0_4_3,
upgrades.Upgrade_0_4_4,
upgrades.Upgrade_0_4_5,
v0_5_0.Upgrade,
v0_5_1.Upgrade,
v0_5_2.Upgrade,
upgrades.Upgrade_0_6_0_RC3,
upgrades.Upgrade_0_6_0,
upgrades.Upgrade_0_6_1,
upgrades.Upgrade_0_7_0,
upgrades.Upgrade_0_7_1,
// upgrades.Upgrade_0_8_0,
upgrades.Upgrade_0_8_1,
v0_9_1.Upgrade,
upgrades.Upgrade_0_9_2,
upgrades.Upgrade_0_9_3,
upgrades.Upgrade_0_9_5,
v0_9_6.Upgrade,
v0_9_7.Upgrade,
v0_9_8.Upgrade,
upgrades.Upgrade_0_10_0,
upgrades.Upgrade_0_10_1,
upgrades.Upgrade_0_11_0,
upgrades.Upgrade_0_11_1,
upgrades.Upgrade_0_11_2,
upgrades.Upgrade_0_12_0,
upgrades.Upgrade_0_12_1,
upgrades.Upgrade_0_13_0,
upgrades.Upgrade_0_13_1,
upgrades.Upgrade_0_14_0,
upgrades.Upgrade_0_15_0,
upgrades.Upgrade_0_15_1,
upgrades.Upgrade_0_16_0,
upgrades.Upgrade_0_20_1,
}

// this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
Expand Down
184 changes: 2 additions & 182 deletions app/upgrades/empty_upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/lavanet/lava/app/keepers"
plansmoduletypes "github.com/lavanet/lava/x/plans/types"
projectsmoduletypes "github.com/lavanet/lava/x/projects/types"
protocolmoduletypes "github.com/lavanet/lava/x/protocol/types"
subscriptionmoduletypes "github.com/lavanet/lava/x/subscription/types"
)

func defaultUpgradeHandler(
Expand Down Expand Up @@ -38,184 +34,8 @@ func defaultUpgradeHandler(
// },
// }

var Upgrade_0_4_0 = Upgrade{
UpgradeName: "v0.4.0",
var Upgrade_0_20_1 = Upgrade{
UpgradeName: "v0.20.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_4_3 = Upgrade{
UpgradeName: "v0.4.3",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_4_4 = Upgrade{
UpgradeName: "v0.4.4",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_4_5 = Upgrade{
UpgradeName: "v0.4.5",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_6_0 = Upgrade{
UpgradeName: "v0.6.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_6_0_RC3 = Upgrade{
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_6_1 = Upgrade{
UpgradeName: "v0.6.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

// Upgrade_0_7_0 adds three new modules: plan, subscription, projects
var Upgrade_0_7_0 = Upgrade{
UpgradeName: "v0.7.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{
plansmoduletypes.StoreKey,
projectsmoduletypes.StoreKey,
subscriptionmoduletypes.StoreKey,
},
},
}

var Upgrade_0_7_1 = Upgrade{
UpgradeName: "v0.7.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

//// Upgrade_0_8_0 canceled: module StoreKey "projects" renamed to "project" without store
//// rename/delete/add; outcome not recoverable (due to cosmos-sdk v0.45.11 bug?).
// var Upgrade_0_8_0 = Upgrade{
// UpgradeName: "v0.8.0-RC1",
// CreateUpgradeHandler: defaultUpgradeHandler,
// StoreUpgrades: store.StoreUpgrades{},
// }

// for Upgrade_0_8_1 the old StoreKey for Projects module
const oldProjectsModuleStoreKey = "projects"

// Upgrade_0_8_1 fixes StoreKey "projects"->"project": delete old and add new
var Upgrade_0_8_1 = Upgrade{
UpgradeName: "v0.8.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Deleted: []string{oldProjectsModuleStoreKey},
Added: []string{projectsmoduletypes.StoreKey},
},
}

var Upgrade_0_9_2 = Upgrade{
UpgradeName: "v0.9.2",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_9_3 = Upgrade{
UpgradeName: "v0.9.3",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_9_5 = Upgrade{
UpgradeName: "v0.9.5",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_10_0 = Upgrade{
UpgradeName: "v0.10.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_10_1 = Upgrade{
UpgradeName: "v0.10.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_11_0 = Upgrade{
UpgradeName: "v0.11.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_11_1 = Upgrade{
UpgradeName: "v0.11.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_11_2 = Upgrade{
UpgradeName: "v0.11.2",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_12_0 = Upgrade{
UpgradeName: "v0.12.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_12_1 = Upgrade{
UpgradeName: "v0.12.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_13_0 = Upgrade{
UpgradeName: "v0.13.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_13_1 = Upgrade{
UpgradeName: "v0.13.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_14_0 = Upgrade{
UpgradeName: "v0.14.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_15_0 = Upgrade{
UpgradeName: "v0.15.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

var Upgrade_0_15_1 = Upgrade{
UpgradeName: "v0.15.1",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{},
}

// Upgrade_0_16_0 adds new modules: protocol
var Upgrade_0_16_0 = Upgrade{
UpgradeName: "v0.16.0",
CreateUpgradeHandler: defaultUpgradeHandler,
StoreUpgrades: store.StoreUpgrades{
Added: []string{
protocolmoduletypes.StoreKey,
},
},
}
45 changes: 0 additions & 45 deletions app/upgrades/v0_5_0/upgrade.go

This file was deleted.

36 changes: 0 additions & 36 deletions app/upgrades/v0_5_1/upgrade.go

This file was deleted.

53 changes: 0 additions & 53 deletions app/upgrades/v0_5_2/upgrade.go

This file was deleted.

Loading

0 comments on commit 26691d6

Please sign in to comment.