nit: update err syntax

cosmos · Jan 17, 2022 · 9664568 · 9664568
1 parent f3e9f95
commit 9664568
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go
@@ -117,18 +117,15 @@ func (k Keeper) RefundFeesOnChannel(ctx sdk.Context, portID, channelID string) e
 		// refund all fees to refund address
 		// Use SendCoins rather than the module account send functions since refund address may be a user account or module address.
 		// if any `SendCoins` call returns an error, we return error and stop iteration
-		err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.ReceiveFee)
-		if err != nil {
+		if err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.ReceiveFee); err != nil {
 			refundErr = err
 			return true
 		}
-		err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.AckFee)
-		if err != nil {
+		if err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.AckFee); err != nil {
 			refundErr = err
 			return true
 		}
-		err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.TimeoutFee)
-		if err != nil {
+		if err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.TimeoutFee); err != nil {
 			refundErr = err
 			return true
 		}

diff --git a/modules/apps/29-fee/keeper/msg_server.go b/modules/apps/29-fee/keeper/msg_server.go
@@ -44,8 +44,7 @@ func (k Keeper) PayPacketFee(goCtx context.Context, msg *types.MsgPayPacketFee)
 	}
 
 	identifiedPacket := types.NewIdentifiedPacketFee(packetId, msg.Fee, msg.Signer, msg.Relayers)
-	err := k.EscrowPacketFee(ctx, identifiedPacket)
-	if err != nil {
+	if err := k.EscrowPacketFee(ctx, identifiedPacket); err != nil {
 		return nil, err
 	}
 
@@ -58,8 +57,7 @@ func (k Keeper) PayPacketFee(goCtx context.Context, msg *types.MsgPayPacketFee)
 func (k Keeper) PayPacketFeeAsync(goCtx context.Context, msg *types.MsgPayPacketFeeAsync) (*types.MsgPayPacketFeeAsyncResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	err := k.EscrowPacketFee(ctx, &msg.IdentifiedPacketFee)
-	if err != nil {
+	if err := k.EscrowPacketFee(ctx, &msg.IdentifiedPacketFee); err != nil {
 		return nil, err
 	}