From 07f12bf0496215a13d3ffed515bedd957db028da Mon Sep 17 00:00:00 2001 From: Sean King Date: Mon, 17 Jan 2022 17:28:59 +0100 Subject: [PATCH] nit: more --- modules/apps/29-fee/types/msgs.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go index 926da90de4e..240e105aa65 100644 --- a/modules/apps/29-fee/types/msgs.go +++ b/modules/apps/29-fee/types/msgs.go @@ -58,19 +58,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) + _, err := sdk.AccAddressFromBech32(msg.Signer) if err != nil { return sdkerrors.Wrap(err, "failed to convert msg.Signer into sdk.AccAddress") } @@ -117,8 +115,7 @@ func (msg MsgPayPacketFeeAsync) ValidateBasic() error { return sdkerrors.Wrap(err, "failed to convert msg.Signer into sdk.AccAddress") } - err = msg.IdentifiedPacketFee.Validate() - if err != nil { + if err = msg.IdentifiedPacketFee.Validate(); err != nil { return sdkerrors.Wrap(err, "Invalid IdentifiedPacketFee") } @@ -146,12 +143,11 @@ func NewIdentifiedPacketFee(packetId *channeltypes.PacketId, fee Fee, refundAddr func (fee IdentifiedPacketFee) Validate() error { // validate PacketId - err := fee.PacketId.Validate() - if err != nil { + 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") }