From 812c14013c31fe926cf6768a6b13e032bf97549f Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 25 Jun 2024 16:16:21 +0200 Subject: [PATCH] chore: replace continue with if/else --- modules/apps/transfer/keeper/relay.go | 63 +++++++++++++-------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/modules/apps/transfer/keeper/relay.go b/modules/apps/transfer/keeper/relay.go index 7cff4bc333c..35eaf6500df 100644 --- a/modules/apps/transfer/keeper/relay.go +++ b/modules/apps/transfer/keeper/relay.go @@ -224,49 +224,46 @@ func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, data t // Appending token. The new denom has been computed receivedCoins = append(receivedCoins, coin) + } else { + // sender chain is the source, mint vouchers - // Continue processing rest of tokens in packet data. - continue - } + // since SendPacket did not prefix the denomination, we must add the destination port and channel to the trace + trace := []types.Trace{types.NewTrace(packet.DestinationPort, packet.DestinationChannel)} + token.Denom.Trace = append(trace, token.Denom.Trace...) - // sender chain is the source, mint vouchers + if !k.HasDenom(ctx, token.Denom.Hash()) { + k.SetDenom(ctx, token.Denom) + } - // since SendPacket did not prefix the denomination, we must add the destination port and channel to the trace - trace := []types.Trace{types.NewTrace(packet.DestinationPort, packet.DestinationChannel)} - token.Denom.Trace = append(trace, token.Denom.Trace...) + voucherDenom := token.Denom.IBCDenom() + if !k.bankKeeper.HasDenomMetaData(ctx, voucherDenom) { + k.setDenomMetadata(ctx, token.Denom) + } - if !k.HasDenom(ctx, token.Denom.Hash()) { - k.SetDenom(ctx, token.Denom) - } + events.EmitDenomEvent(ctx, token) - voucherDenom := token.Denom.IBCDenom() - if !k.bankKeeper.HasDenomMetaData(ctx, voucherDenom) { - k.setDenomMetadata(ctx, token.Denom) - } + voucher := sdk.NewCoin(voucherDenom, transferAmount) - events.EmitDenomEvent(ctx, token) + // mint new tokens if the source of the transfer is the same chain + if err := k.bankKeeper.MintCoins( + ctx, types.ModuleName, sdk.NewCoins(voucher), + ); err != nil { + return errorsmod.Wrap(err, "failed to mint IBC tokens") + } - voucher := sdk.NewCoin(voucherDenom, transferAmount) + // send to receiver + if err := k.bankKeeper.SendCoinsFromModuleToAccount( + ctx, types.ModuleName, receiver, sdk.NewCoins(voucher), + ); err != nil { + return errorsmod.Wrapf(err, "failed to send coins to receiver %s", receiver.String()) + } - // mint new tokens if the source of the transfer is the same chain - if err := k.bankKeeper.MintCoins( - ctx, types.ModuleName, sdk.NewCoins(voucher), - ); err != nil { - return errorsmod.Wrap(err, "failed to mint IBC tokens") - } + denomPath := token.Denom.Path() + labels = append(labels, telemetry.NewLabel(coretypes.LabelSource, "false")) + defer internaltelemetry.ReportOnRecvPacketTelemetry(transferAmount, denomPath, labels) - // send to receiver - if err := k.bankKeeper.SendCoinsFromModuleToAccount( - ctx, types.ModuleName, receiver, sdk.NewCoins(voucher), - ); err != nil { - return errorsmod.Wrapf(err, "failed to send coins to receiver %s", receiver.String()) + receivedCoins = append(receivedCoins, voucher) } - - denomPath := token.Denom.Path() - labels = append(labels, telemetry.NewLabel(coretypes.LabelSource, "false")) - defer internaltelemetry.ReportOnRecvPacketTelemetry(transferAmount, denomPath, labels) - - receivedCoins = append(receivedCoins, voucher) } if data.ShouldBeForwarded() {