nit: update err syntax (#747)

* nit: update err syntax * nit: more * nit: err syntax
cosmos · Jan 20, 2022 · 16e452b · 16e452b
1 parent f552fb2
commit 16e452b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go
@@ -117,19 +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.RecvFee)
-		if err != nil {
+		if err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, refundAccAddr, identifiedFee.Fee.RecvFee); 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
 	}
 

diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go
@@ -60,20 +60,17 @@ func NewMsgPayPacketFee(fee Fee, sourcePortId, sourceChannelId, signer string, r
 // ValidateBasic performs a basic check of the MsgPayPacketFee fields
 func (msg MsgPayPacketFee) ValidateBasic() error {
 	// validate channelId
-	err := host.ChannelIdentifierValidator(msg.SourceChannelId)
-	if err != nil {
+	if err := host.ChannelIdentifierValidator(msg.SourceChannelId); err != nil {
 		return err
 	}
 
 	// validate portId
-	err = host.PortIdentifierValidator(msg.SourcePortId)
-	if err != nil {
+	if err := host.PortIdentifierValidator(msg.SourcePortId); err != nil {
 		return err
 	}
 
 	// signer check
-	_, err = sdk.AccAddressFromBech32(msg.Signer)
-	if err != nil {
+	if _, err := sdk.AccAddressFromBech32(msg.Signer); err != nil {
 		return sdkerrors.Wrap(err, "failed to convert msg.Signer into sdk.AccAddress")
 	}
 
@@ -119,9 +116,8 @@ func (msg MsgPayPacketFeeAsync) ValidateBasic() error {
 		return sdkerrors.Wrap(err, "failed to convert msg.Signer into sdk.AccAddress")
 	}
 
-	err = msg.IdentifiedPacketFee.Validate()
-	if err != nil {
-		return sdkerrors.Wrap(err, "invalid IdentifiedPacketFee")
+	if err = msg.IdentifiedPacketFee.Validate(); err != nil {
+		return sdkerrors.Wrap(err, "Invalid IdentifiedPacketFee")
 	}
 
 	return nil
@@ -149,12 +145,11 @@ func NewIdentifiedPacketFee(packetId channeltypes.PacketId, fee Fee, refundAddr
 // Validate performs a stateless check of the IdentifiedPacketFee fields
 func (fee IdentifiedPacketFee) Validate() error {
 	// validate PacketId
-	err := fee.PacketId.Validate()
-	if err != nil {
-		return sdkerrors.Wrap(err, "invalid PacketId")
+	if err := fee.PacketId.Validate(); err != nil {
+		return sdkerrors.Wrap(err, "Invalid PacketId")
 	}
 
-	_, err = sdk.AccAddressFromBech32(fee.RefundAddress)
+	_, err := sdk.AccAddressFromBech32(fee.RefundAddress)
 	if err != nil {
 		return sdkerrors.Wrap(err, "failed to convert RefundAddress into sdk.AccAddress")
 	}