Skip to content

Commit

Permalink
fix: remove v6 upgrade handler from simapp
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-axner committed Aug 5, 2024
1 parent 39c7852 commit 02cff95
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions simapp/upgrades/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package upgrades
import (
"context"

storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"

"github.com/cosmos/cosmos-sdk/baseapp"
Expand All @@ -14,8 +13,6 @@ import (
paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"

capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
"github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/controller/migrations/v6"
clientkeeper "github.com/cosmos/ibc-go/v9/modules/core/02-client/keeper"
"github.com/cosmos/ibc-go/v9/modules/core/exported"
ibctmmigrations "github.com/cosmos/ibc-go/v9/modules/light-clients/07-tendermint/migrations"
Expand All @@ -24,8 +21,6 @@ import (
const (
// V5 defines the upgrade name for the ibc-go/v5 upgrade handler.
V5 = "normal upgrade" // NOTE: keeping as "normal upgrade" as existing tags depend on this name
// V6 defines the upgrade name for the ibc-go/v6 upgrade handler.
V6 = "v6"
// V7 defines the upgrade name for the ibc-go/v7 upgrade handler.
V7 = "v7"
// V7_1 defines the upgrade name for the ibc-go/v7.1 upgrade handler.
Expand All @@ -49,26 +44,6 @@ func CreateDefaultUpgradeHandler(
}
}

// CreateV6UpgradeHandler creates an upgrade handler for the ibc-go/v6 SimApp upgrade.
// NOTE: The v6.MigrateICS27ChannelCapabiliity function can be omitted if chains do not yet implement an ICS27 controller module
func CreateV6UpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
cdc codec.BinaryCodec,
capabilityStoreKey *storetypes.KVStoreKey,
capabilityKeeper *capabilitykeeper.Keeper,
moduleName string,
) upgradetypes.UpgradeHandler {
return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
sdkCtx := sdk.UnwrapSDKContext(ctx)
if err := v6.MigrateICS27ChannelCapability(sdkCtx, cdc, capabilityStoreKey, capabilityKeeper, moduleName); err != nil {
return nil, err
}

return mm.RunMigrations(ctx, configurator, vm)
}
}

// CreateV7UpgradeHandler creates an upgrade handler for the ibc-go/v7 SimApp upgrade.
func CreateV7UpgradeHandler(
mm *module.Manager,
Expand Down

0 comments on commit 02cff95

Please sign in to comment.