From 6ddfdeda88e2d7270fcb1c87d8e59abd97edfd6d Mon Sep 17 00:00:00 2001 From: VegeBun-csj Date: Thu, 14 Dec 2023 22:30:42 +0800 Subject: [PATCH] update --- app/app.go | 4 +++- app/upgrades/v0_3_0/constants.go | 15 --------------- app/upgrades/v0_3_0/upgrades.go | 30 ------------------------------ 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 app/upgrades/v0_3_0/upgrades.go diff --git a/app/app.go b/app/app.go index a29fbf3..22123b0 100644 --- a/app/app.go +++ b/app/app.go @@ -1084,7 +1084,9 @@ func (app *App) ModuleManager() *module.Manager { func (app *App) setupUpgradeHandlers() { app.UpgradeKeeper.SetUpgradeHandler( v0_3_0.UpgradeName, - v0_3_0.CreateUpgradeHandler(app.mm, app.Configurator()), + func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + return app.ModuleManager().RunMigrations(ctx, app.Configurator(), fromVM) + }, ) // setup store loader diff --git a/app/upgrades/v0_3_0/constants.go b/app/upgrades/v0_3_0/constants.go index f5366cc..67aa7cf 100644 --- a/app/upgrades/v0_3_0/constants.go +++ b/app/upgrades/v0_3_0/constants.go @@ -1,18 +1,3 @@ package v0_3_0 -/* import ( - "github.com/DoraFactory/doravota/v0_3_0/app/upgrades" - - store "github.com/cosmos/cosmos-sdk/store/types" -) */ - const UpgradeName = "0.3.0" - -/* var Upgrade = upgrades.Upgrade{ - UpgradeName: UpgradeName, - CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: store.StoreUpgrades{ - Added: []string{}, - Deleted: []string{}, - }, -} */ \ No newline at end of file diff --git a/app/upgrades/v0_3_0/upgrades.go b/app/upgrades/v0_3_0/upgrades.go deleted file mode 100644 index bb722e2..0000000 --- a/app/upgrades/v0_3_0/upgrades.go +++ /dev/null @@ -1,30 +0,0 @@ -package v0_3_0 - -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 CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { -/* logger := ctx.Logger().With("upgrade", UpgradeName) - // we just upgrade the wasm version, so we do nothing in module - // logger.Debug("running module migrations ...") */ - - ctx.Logger().Info("running module migrations ...") - migrations, err := mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return nil, err - } - ctx.Logger().Info("migrations has been run...") - - - return migrations, nil - // return mm.RunMigrations(ctx, configurator, vm) - } -} \ No newline at end of file