Skip to content

Commit

Permalink
move migrations to app/upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-zaremba committed Dec 2, 2022
1 parent e6bcdf6 commit 46dea3b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ func New(

ibcTransferModule,
gravity.NewAppModule(app.GravityKeeper, app.BankKeeper),
leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper, app.GovKeeper),
leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper),
oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper, Experimental),
bech32ibc.NewAppModule(appCodec, app.bech32IbcKeeper),
}
Expand Down
16 changes: 15 additions & 1 deletion app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types"

"github.com/umee-network/umee/v3/app/upgradev3"
"github.com/umee-network/umee/v3/app/upgradev3_3"
leveragetypes "github.com/umee-network/umee/v3/x/leverage/types"
oracletypes "github.com/umee-network/umee/v3/x/oracle/types"
)
Expand All @@ -36,10 +37,17 @@ func (app *UmeeApp) registerV3_1to3_3_Upgrade(_ upgradetypes.Plan) {
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
err := bankkeeper.NewMigrator(app.BankKeeper).Migrate3_V046_4_To_V046_5(ctx)
ctx.Logger().Info("Run v3.3 migrator")
err := upgradev3_3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run x/bank v0.46.5 migration")
err = bankkeeper.NewMigrator(app.BankKeeper).Migrate3_V046_4_To_V046_5(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run module migrations")
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
}
Expand All @@ -51,6 +59,12 @@ func (app *UmeeApp) registerV3_2to3_3_Upgrade(_ upgradetypes.Plan) {
planName,
func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
ctx.Logger().Info("Upgrade handler execution", "name", planName)
ctx.Logger().Info("Run v3.3 migrator")
err := upgradev3_3.Migrator(app.GovKeeper, app.interfaceRegistry)(ctx)
if err != nil {
return fromVM, err
}
ctx.Logger().Info("Run module migrations")
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mv2
package upgradev3_3

import (
"fmt"
Expand All @@ -17,7 +17,7 @@ import (
// Implements Proposal Interface
var _ gov.Content = &UpdateRegistryProposal{}

func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
func registerInterfaces(registry cdctypes.InterfaceRegistry) {
registry.RegisterImplementations(
(*gov.Content)(nil),
&UpdateRegistryProposal{},
Expand All @@ -28,7 +28,8 @@ type migrator struct {
gov govkeeper.Keeper
}

func Migrator1to2(gk govkeeper.Keeper) module.MigrationHandler {
func Migrator(gk govkeeper.Keeper, registry cdctypes.InterfaceRegistry) module.MigrationHandler {
registerInterfaces(registry)
m := migrator{gk}
return m.migrate
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mv2
package upgradev3_3

import (
"encoding/json"
Expand Down
13 changes: 1 addition & 12 deletions x/leverage/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"

govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"

"github.com/umee-network/umee/v3/x/leverage/client/cli"
"github.com/umee-network/umee/v3/x/leverage/keeper"
"github.com/umee-network/umee/v3/x/leverage/migrations/mv2"
"github.com/umee-network/umee/v3/x/leverage/simulation"
"github.com/umee-network/umee/v3/x/leverage/types"
)
Expand Down Expand Up @@ -58,7 +55,6 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
// RegisterInterfaces registers the module's interface types.
func (a AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {
types.RegisterInterfaces(reg)
mv2.RegisterInterfaces(reg)
}

// DefaultGenesis returns the x/leverage module's default genesis state.
Expand Down Expand Up @@ -109,16 +105,14 @@ type AppModule struct {
keeper keeper.Keeper
accountKeeper types.AccountKeeper
bankKeeper bankkeeper.Keeper
govKeeper govkeeper.Keeper
}

func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak types.AccountKeeper, bk bankkeeper.Keeper, gk govkeeper.Keeper) AppModule {
func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak types.AccountKeeper, bk bankkeeper.Keeper) AppModule {
return AppModule{
AppModuleBasic: NewAppModuleBasic(cdc),
keeper: keeper,
accountKeeper: ak,
bankKeeper: bk,
govKeeper: gk,
}
}

Expand Down Expand Up @@ -150,11 +144,6 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd
func (am AppModule) RegisterServices(cfg module.Configurator) {
types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
types.RegisterQueryServer(cfg.QueryServer(), keeper.NewQuerier(am.keeper))

err := cfg.RegisterMigration(types.ModuleName, 1, mv2.Migrator1to2(am.govKeeper))
if err != nil {
panic(err)
}
}

// RegisterInvariants registers the x/leverage module's invariants.
Expand Down

0 comments on commit 46dea3b

Please sign in to comment.