adding updates to migrations and tests additional assertions

modules/apps/27-interchain-accounts/controller/keeper/migrations.go

@@ -15,16 +15,16 @@ import (
 	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
 )
 
-// MigrateChannelCapability performs a search on a prefix store using the provided authModule name,
-// retrieves the associated capability index and reassigns ownership to the ICS27 controller submodule
+// MigrateChannelCapability 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 MigrateChannelCapability(
 	ctx sdk.Context,
 	cdc codec.BinaryCodec,
 	memStoreKey storetypes.StoreKey,
-	capabilityKeeper capabilitykeeper.Keeper,
-	authModule string,
+	capabilityKeeper *capabilitykeeper.Keeper,
+	module string,
 ) error {
-	keyPrefix := capabilitytypes.RevCapabilityKey(authModule, fmt.Sprintf("%s/%s/%s", host.KeyChannelCapabilityPrefix, host.KeyPortPrefix, icatypes.PortPrefix))
+	keyPrefix := capabilitytypes.RevCapabilityKey(module, fmt.Sprintf("%s/%s/%s", host.KeyChannelCapabilityPrefix, host.KeyPortPrefix, icatypes.PortPrefix))
 	prefixStore := prefix.NewStore(ctx.KVStore(memStoreKey), keyPrefix)
 	iterator := sdk.KVStorePrefixIterator(prefixStore, nil)
 
@@ -34,23 +34,24 @@ func MigrateChannelCapability(
 
 		// reconstruct the capability name using the prefix and iterator key
 		name := fmt.Sprintf("%s/%s/%s%s", host.KeyChannelCapabilityPrefix, host.KeyPortPrefix, icatypes.PortPrefix, key)
-		capOwner := capabilitytypes.NewOwner(authModule, name)
+		owner := capabilitytypes.NewOwner(module, name)
 
-		ctx.Logger().Info("migrating ibc channel capability", "owner", capOwner.String())
+		ctx.Logger().Info("migrating ibc channel capability", "owner", owner.String())
 
 		index := sdk.BigEndianToUint64(iterator.Value())
-		capOwners, found := capabilityKeeper.GetOwners(ctx, index)
+		owners, found := capabilityKeeper.GetOwners(ctx, index)
 		if !found {
 			panic(fmt.Sprintf("no owners for capability at index: %d", index))
 		}
 
-		// remove the existing auth module owner
-		capOwners.Remove(capOwner)
+		// remove the existing module owner
+		owners.Remove(owner)
+		prefixStore.Delete(iterator.Key())
 
 		// add the controller submodule as a new capability owner
-		capOwners.Set(capabilitytypes.NewOwner(types.SubModuleName, name))
-
-		capabilityKeeper.SetOwners(ctx, index, capOwners)
+		owners.Set(capabilitytypes.NewOwner(types.SubModuleName, name))
+		capabilityKeeper.SetOwners(ctx, index, owners)
+		capabilityKeeper.InitializeCapability(ctx, index, owners)
 	}
 
 	return nil

modules/apps/27-interchain-accounts/controller/keeper/migrations_test.go

@@ -4,6 +4,9 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 
 	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper"
+	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
+	host "github.com/cosmos/ibc-go/v5/modules/core/24-host"
+	ibcmock "github.com/cosmos/ibc-go/v5/testing/mock"
 )
 
 func (suite *KeeperTestSuite) TestMigrateChannelCapability() {
@@ -15,15 +18,33 @@ func (suite *KeeperTestSuite) TestMigrateChannelCapability() {
 	err := SetupICAPath(path, TestOwnerAddress)
 	suite.Require().NoError(err)
 
+	capName := host.ChannelCapabilityPath(path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID)
+
+	// assert the capability is owned by the auth module pre migration
+	cap, found := suite.chainA.GetSimApp().ScopedICAMockKeeper.GetCapability(suite.chainA.GetContext(), capName)
+	suite.Require().NotNil(cap)
+	suite.Require().True(found)
+
+	cap, found = suite.chainA.GetSimApp().ScopedICAControllerKeeper.GetCapability(suite.chainA.GetContext(), capName)
+	suite.Require().Nil(cap)
+	suite.Require().False(found)
+
 	err = keeper.MigrateChannelCapability(
 		suite.chainA.GetContext(),
 		suite.chainA.Codec,
 		suite.chainA.GetSimApp().GetMemKey(capabilitytypes.MemStoreKey),
-		*suite.chainA.GetSimApp().CapabilityKeeper,
-		"mockicacontroller",
+		suite.chainA.GetSimApp().CapabilityKeeper,
+		ibcmock.ModuleName+types.SubModuleName,
 	)
 
 	suite.Require().NoError(err)
 
-	// TODO: follow up assertions
+	// assert the capability is now owned by the controller submodule
+	cap, found = suite.chainA.GetSimApp().ScopedICAControllerKeeper.GetCapability(suite.chainA.GetContext(), capName)
+	suite.Require().NotNil(cap)
+	suite.Require().True(found)
+
+	cap, found = suite.chainA.GetSimApp().ScopedICAMockKeeper.GetCapability(suite.chainA.GetContext(), capName)
+	suite.Require().Nil(cap)
+	suite.Require().False(found)
 }