Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nit: update err syntax #747

Merged
merged 5 commits into from
Jan 20, 2022
Merged

nit: update err syntax #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9664568
nit: update err syntax
seantking Jan 17, 2022
07f12bf
nit: more
seantking Jan 17, 2022
1b2a40c
nit: err syntax
seantking Jan 20, 2022
8ceb3f2
Merge branch 'ics29-fee-middleware' into sean/nit-err-syntax
seantking Jan 20, 2022
71aee38
Merge branch 'ics29-fee-middleware' into sean/nit-err-syntax
seantking Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions modules/apps/29-fee/keeper/escrow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 2 additions & 4 deletions modules/apps/29-fee/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
21 changes: 8 additions & 13 deletions modules/apps/29-fee/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")
}
Expand Down