code hygiene: ics-29 improvements (cosmos#3221)

faddat · Mar 3, 2023 · 7a52fad · 7a52fad
1 parent 1ec697e
commit 7a52fad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/modules/apps/29-fee/ibc_middleware.go b/modules/apps/29-fee/ibc_middleware.go
@@ -275,10 +275,7 @@ func (im IBCMiddleware) OnAcknowledgementPacket(
 
 	payee, found := im.keeper.GetPayeeAddress(ctx, relayer.String(), packet.SourceChannel)
 	if !found {
-		im.keeper.DistributePacketFeesOnAcknowledgement(ctx, ack.ForwardRelayerAddress, relayer, feesInEscrow.PacketFees, packetID)
-
-		// call underlying callback
-		return im.app.OnAcknowledgementPacket(ctx, packet, ack.AppAcknowledgement, relayer)
+		payee = relayer.String()
 	}
 
 	payeeAddr, err := sdk.AccAddressFromBech32(payee)
@@ -317,10 +314,7 @@ func (im IBCMiddleware) OnTimeoutPacket(
 
 	payee, found := im.keeper.GetPayeeAddress(ctx, relayer.String(), packet.SourceChannel)
 	if !found {
-		im.keeper.DistributePacketFeesOnTimeout(ctx, relayer, feesInEscrow.PacketFees, packetID)
-
-		// call underlying callback
-		return im.app.OnTimeoutPacket(ctx, packet, relayer)
+		payee = relayer.String()
 	}
 
 	payeeAddr, err := sdk.AccAddressFromBech32(payee)

diff --git a/modules/apps/29-fee/types/expected_keepers.go b/modules/apps/29-fee/types/expected_keepers.go
@@ -31,7 +31,6 @@ type BankKeeper interface {
 	HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool
 	SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 	SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
-	SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
 	BlockedAddr(sdk.AccAddress) bool
 	IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error
 }