Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: leverage gov proposal migrations #1640

Merged
merged 18 commits into from
Dec 5, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add v3.3 upgrades
  • Loading branch information
robert-zaremba committed Dec 2, 2022
commit e6bcdf69ee9b597f17b6274a2d46500d5c378c3b
33 changes: 23 additions & 10 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ func (app UmeeApp) RegisterUpgradeHandlers(experimental bool) {
panic(err)
}

app.registerV3_0Upgrade(upgradeInfo)
app.registerV3_1Upgrade(upgradeInfo)
app.registerV3_2Upgrade(upgradeInfo)
app.registerV3_0_Upgrade(upgradeInfo)
app.registerV3_1_Upgrade(upgradeInfo)

app.registerV3_1to3_3_Upgrade(upgradeInfo)
app.registerV3_2to3_3_Upgrade(upgradeInfo)
}

// performs upgrade from v3.1 -> v3.2
func (app *UmeeApp) registerV3_2Upgrade(_ upgradetypes.Plan) {
const planName = "v3.2"
// performs upgrade from v3.1 -> v3.3 (including the v3.2 chanages)
func (app *UmeeApp) registerV3_1to3_3_Upgrade(_ upgradetypes.Plan) {
const planName = "v3.1-v3.3"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
Expand All @@ -42,14 +44,25 @@ func (app *UmeeApp) registerV3_2Upgrade(_ upgradetypes.Plan) {
})
}

// performs upgrade from v3.2 -> v3.3
func (app *UmeeApp) registerV3_2to3_3_Upgrade(_ upgradetypes.Plan) {
const planName = "v3.3"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
}

// performs upgrade from v3.0 -> v3.1
func (app *UmeeApp) registerV3_1Upgrade(_ upgradetypes.Plan) {
func (app *UmeeApp) registerV3_1_Upgrade(_ upgradetypes.Plan) {
const planName = "v3.1.0"
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyRunMigrations(app, planName))
app.UpgradeKeeper.SetUpgradeHandler(planName, onlyModuleMigrations(app, planName))
}

// performs upgrade from v1->v3
func (app *UmeeApp) registerV3_0Upgrade(upgradeInfo upgradetypes.Plan) {
func (app *UmeeApp) registerV3_0_Upgrade(upgradeInfo upgradetypes.Plan) {
const planName = "v1.1-v3.0"
app.UpgradeKeeper.SetUpgradeHandler(
planName,
Expand Down Expand Up @@ -101,7 +114,7 @@ func (app *UmeeApp) registerV3_0Upgrade(upgradeInfo upgradetypes.Plan) {
}})
}

func onlyRunMigrations(app *UmeeApp, planName string) upgradetypes.UpgradeHandler {
func onlyModuleMigrations(app *UmeeApp, planName string) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
Expand Down