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

chore: create ResultType for ChannelV2 #7534

Merged
merged 8 commits into from
Nov 5, 2024
Merged

chore: create ResultType for ChannelV2 #7534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5911185
chore: lockin v0.50.10 (#7532)
damiannolan Nov 4, 2024
eaf5774
chore: create ResultType for ChannelV2
bznein Nov 4, 2024
5975a3f
Merge remote-tracking branch 'origin' into bznein/7531/V2ChannelResul…
bznein Nov 4, 2024
8d1bed1
Merge branch 'feat/ibc-eureka' into bznein/7531/V2ChannelResultyType
bznein Nov 4, 2024
9936e88
move redundancy chgecks to new result type
bznein Nov 4, 2024
9912862
empty commit
bznein Nov 4, 2024
62609cf
Revert "chore: lockin v0.50.10 (#7532)"
bznein Nov 4, 2024
11f2b37
Fix timeout in ante tests for V2
bznein Nov 5, 2024
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
17 changes: 8 additions & 9 deletions modules/core/04-channel/v2/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

channeltypesv1 "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"
"github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types"
ibcerrors "github.com/cosmos/ibc-go/v9/modules/core/errors"
internalerrors "github.com/cosmos/ibc-go/v9/modules/core/internal/errors"
Expand Down Expand Up @@ -123,7 +122,7 @@ func (k *Keeper) RecvPacket(ctx context.Context, msg *types.MsgRecvPacket) (*typ
case types.ErrNoOpMsg:
// no-ops do not need event emission as they will be ignored
sdkCtx.Logger().Debug("no-op on redundant relay", "source-channel", msg.Packet.SourceChannel)
return &types.MsgRecvPacketResponse{Result: channeltypesv1.NOOP}, nil
return &types.MsgRecvPacketResponse{Result: types.NOOP}, nil
default:
sdkCtx.Logger().Error("receive packet failed", "source-channel", msg.Packet.SourceChannel, "error", errorsmod.Wrap(err, "receive packet verification failed"))
return nil, errorsmod.Wrap(err, "receive packet verification failed")
Expand Down Expand Up @@ -157,7 +156,7 @@ func (k *Keeper) RecvPacket(ctx context.Context, msg *types.MsgRecvPacket) (*typ
// note this should never happen as the payload would have had to be empty.
if len(ack.AcknowledgementResults) == 0 {
sdkCtx.Logger().Error("receive packet failed", "source-channel", msg.Packet.SourceChannel, "error", errorsmod.Wrap(err, "invalid acknowledgement results"))
return &types.MsgRecvPacketResponse{Result: channeltypesv1.FAILURE}, errorsmod.Wrapf(err, "receive packet failed source-channel %s invalid acknowledgement results", msg.Packet.SourceChannel)
return &types.MsgRecvPacketResponse{Result: types.FAILURE}, errorsmod.Wrapf(err, "receive packet failed source-channel %s invalid acknowledgement results", msg.Packet.SourceChannel)
}

// NOTE: TBD how we will handle async acknowledgements with more than one payload.
Expand All @@ -176,8 +175,8 @@ func (k *Keeper) RecvPacket(ctx context.Context, msg *types.MsgRecvPacket) (*typ

defer telemetry.ReportRecvPacket(msg.Packet)

sdkCtx.Logger().Info("receive packet callback succeeded", "source-channel", msg.Packet.SourceChannel, "dest-channel", msg.Packet.DestinationChannel, "result", channeltypesv1.SUCCESS.String())
return &types.MsgRecvPacketResponse{Result: channeltypesv1.SUCCESS}, nil
sdkCtx.Logger().Info("receive packet callback succeeded", "source-channel", msg.Packet.SourceChannel, "dest-channel", msg.Packet.DestinationChannel, "result", types.SUCCESS.String())
return &types.MsgRecvPacketResponse{Result: types.SUCCESS}, nil
}

// Acknowledgement defines an rpc handler method for MsgAcknowledgement.
Expand All @@ -198,7 +197,7 @@ func (k *Keeper) Acknowledgement(ctx context.Context, msg *types.MsgAcknowledgem
case types.ErrNoOpMsg:
// no-ops do not need event emission as they will be ignored
sdkCtx.Logger().Debug("no-op on redundant relay", "source-channel", msg.Packet.SourceChannel)
return &types.MsgAcknowledgementResponse{Result: channeltypesv1.NOOP}, nil
return &types.MsgAcknowledgementResponse{Result: types.NOOP}, nil
default:
sdkCtx.Logger().Error("acknowledgement failed", "source-channel", msg.Packet.SourceChannel, "error", errorsmod.Wrap(err, "acknowledge packet verification failed"))
return nil, errorsmod.Wrap(err, "acknowledge packet verification failed")
Expand All @@ -217,7 +216,7 @@ func (k *Keeper) Acknowledgement(ctx context.Context, msg *types.MsgAcknowledgem
}
}

return &types.MsgAcknowledgementResponse{Result: channeltypesv1.SUCCESS}, nil
return &types.MsgAcknowledgementResponse{Result: types.SUCCESS}, nil
}

// Timeout defines a rpc handler method for MsgTimeout.
Expand All @@ -242,7 +241,7 @@ func (k *Keeper) Timeout(ctx context.Context, timeout *types.MsgTimeout) (*types
case types.ErrNoOpMsg:
// no-ops do not need event emission as they will be ignored
sdkCtx.Logger().Debug("no-op on redundant relay", "source-channel", timeout.Packet.SourceChannel)
return &types.MsgTimeoutResponse{Result: channeltypesv1.NOOP}, nil
return &types.MsgTimeoutResponse{Result: types.NOOP}, nil
default:
sdkCtx.Logger().Error("timeout failed", "source-channel", timeout.Packet.SourceChannel, "error", errorsmod.Wrap(err, "timeout packet verification failed"))
return nil, errorsmod.Wrap(err, "timeout packet verification failed")
Expand All @@ -256,5 +255,5 @@ func (k *Keeper) Timeout(ctx context.Context, timeout *types.MsgTimeout) (*types
}
}

return &types.MsgTimeoutResponse{Result: channeltypesv1.SUCCESS}, nil
return &types.MsgTimeoutResponse{Result: types.SUCCESS}, nil
}
Loading
Loading