Skip to content

Commit

Permalink
remove unused upgrades and comment
Browse files Browse the repository at this point in the history
  • Loading branch information
expertdicer committed Sep 19, 2023
1 parent e8d5c69 commit 58f4e8d
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,13 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmclient "github.com/CosmWasm/wasmd/x/wasm/client"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmappparams "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/params"
appparams "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/params"

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"

// Upgrade Handler
upgrades "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/upgrades"
v2 "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/upgrades/v2"
v2_2_5 "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/upgrades/v2_2_5"
v3 "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/app/upgrades/v3"
)

Expand All @@ -165,7 +163,7 @@ var (
// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
EnableSpecificProposals = ""

Upgrades = []upgrades.Upgrade{v2.Upgrade, v2_2_5.Upgrade, v3.Upgrade}
Upgrades = []upgrades.Upgrade{v3.Upgrade}
)

// GetEnabledProposals parses the ProposalsEnabled / EnableSpecificProposals values to
Expand Down Expand Up @@ -333,7 +331,7 @@ func NewMigalooApp(
skipUpgradeHeights map[int64]bool,
homePath string,
invCheckPeriod uint,
encodingConfig wasmappparams.EncodingConfig,
encodingConfig appparams.EncodingConfig,
enabledProposals []wasm.ProposalType,
appOpts servertypes.AppOptions,
wasmOpts []wasm.Option,
Expand Down Expand Up @@ -1105,17 +1103,6 @@ func (app *MigalooApp) setupUpgradeHandlers(cfg module.Configurator) {
}
}

// TODO: ensure that we include this or its equivalent in the actual upgrade, referencing our v3 upgrade
// Add stores for new modules
// if upgradeInfo.Name == terraappconfig.Upgrade2_3_0 && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
// storeUpgrades := storetypes.StoreUpgrades{
// Added: []string{
// ibchookstypes.StoreKey,
// },
// }
// app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
// }

// GetMaccPerms returns a copy of the module account permissions
func GetMaccPerms() map[string][]string {
dupMaccPerms := make(map[string][]string)
Expand Down

0 comments on commit 58f4e8d

Please sign in to comment.