chore: minor nits - renaming and error msgs

modules/apps/27-interchain-accounts/keeper/account.go

@@ -42,17 +42,17 @@ func (k Keeper) InitInterchainAccount(ctx sdk.Context, connectionID, counterpart
 
 // RegisterInterchainAccount attempts to create a new account using the provided address and stores it in state keyed by the provided port identifier
 // If an account for the provided address already exists this function returns early (no-op)
-func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, accAddr sdk.AccAddress, portID string) {
+func (k Keeper) RegisterInterchainAccount(ctx sdk.Context, accAddr sdk.AccAddress, counterpartyPortID string) {
 	if acc := k.accountKeeper.GetAccount(ctx, accAddr); acc != nil {
 		return
 	}
 
 	interchainAccount := types.NewInterchainAccount(
 		authtypes.NewBaseAccountWithAddress(accAddr),
-		portID,
+		counterpartyPortID,
 	)
 
 	k.accountKeeper.NewAccount(ctx, interchainAccount)
 	k.accountKeeper.SetAccount(ctx, interchainAccount)
-	k.SetInterchainAccountAddress(ctx, portID, interchainAccount.Address)
+	k.SetInterchainAccountAddress(ctx, counterpartyPortID, interchainAccount.Address)
 }

modules/apps/27-interchain-accounts/keeper/handshake.go

@@ -64,7 +64,7 @@ func (k Keeper) OnChanOpenInit(
 
 	// Claim channel capability passed back by IBC module
 	if err := k.ClaimCapability(ctx, chanCap, host.ChannelCapabilityPath(portID, channelID)); err != nil {
-		return sdkerrors.Wrap(channeltypes.ErrChannelCapabilityNotFound, err.Error())
+		return sdkerrors.Wrap(err, "failed to claim capability")
 	}
 
 	return nil
@@ -118,7 +118,7 @@ func (k Keeper) OnChanOpenTry(
 	// On the host chain the capability may only be claimed during the OnChanOpenTry
 	// The capability being claimed in OpenInit is for a controller chain (the port is different)
 	if err := k.ClaimCapability(ctx, chanCap, host.ChannelCapabilityPath(portID, channelID)); err != nil {
-		return err
+		return sdkerrors.Wrap(err, "failed to claim capability")
 	}
 
 	// Check to ensure that the version string contains the expected address generated from the Counterparty portID

modules/apps/27-interchain-accounts/types/errors.go

@@ -7,7 +7,7 @@ import (
 var (
 	ErrUnknownPacketData           = sdkerrors.Register(ModuleName, 2, "unknown packet data")
 	ErrAccountAlreadyExist         = sdkerrors.Register(ModuleName, 3, "account already exist")
-	ErrPortAlreadyBound            = sdkerrors.Register(ModuleName, 4, "port is already bound for address")
+	ErrPortAlreadyBound            = sdkerrors.Register(ModuleName, 4, "port is already bound")
 	ErrUnsupportedChain            = sdkerrors.Register(ModuleName, 5, "unsupported chain")
 	ErrInvalidOutgoingData         = sdkerrors.Register(ModuleName, 6, "invalid outgoing data")
 	ErrInvalidRoute                = sdkerrors.Register(ModuleName, 7, "invalid route")