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.

Sign up for GitHub

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

Addressing small nits for channel capability migrations #2258

Merged
merged 5 commits into from
Sep 13, 2022
Merged

Addressing small nits for channel capability migrations #2258

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60a5553
chore: addressing small nits for channel capability migrations
chatton Sep 9, 2022
05b024b
Merge branch 'main' into cian/issue#2244-channel-capability-migration…
chatton Sep 9, 2022
0aec707
Merge branch 'main' into cian/issue#2244-channel-capability-migration…
chatton Sep 9, 2022
efb5fae
Merge branch 'main' into cian/issue#2244-channel-capability-migration…
chatton Sep 9, 2022
45a51e6
Merge branch 'main' into cian/issue#2244-channel-capability-migration…
chatton Sep 13, 2022
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
8 changes: 4 additions & 4 deletions modules/apps/27-interchain-accounts/controller/migrations/v5/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ import (
capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"

"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
)

// MigrateICS27ChannelCapability performs a search on a prefix store using the provided store key and module name.
// It retrieves the associated channel capability index and reassigns ownership to the ICS27 controller submodule.
func MigrateICS27ChannelCapability(
ctx sdk.Context,
cdc codec.BinaryCodec,
storeKey storetypes.StoreKey,
capabilityStoreKey storetypes.StoreKey,
capabilityKeeper *capabilitykeeper.Keeper,
module string, // the name of the scoped keeper for the underlying app module
) error {
// construct a prefix store using the x/capability index prefix: index->capability owners
prefixStore := prefix.NewStore(ctx.KVStore(storeKey), capabilitytypes.KeyPrefixIndexCapability)
prefixStore := prefix.NewStore(ctx.KVStore(capabilityStoreKey), capabilitytypes.KeyPrefixIndexCapability)
iterator := sdk.KVStorePrefixIterator(prefixStore, nil)
defer iterator.Close()

Expand All @@ -38,7 +38,7 @@ func MigrateICS27ChannelCapability(
owners.Remove(owner)

// reassign the owner module to icacontroller
owner.Module = types.SubModuleName
owner.Module = controllertypes.SubModuleName

// add the controller submodule to the set of owners
if err := owners.Set(owner); err != nil {
Expand Down