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

fix(query): get next send sequence for transfer packets #4706

Merged
merged 9 commits into from
Sep 19, 2023
Merged

fix(query): get next send sequence for transfer packets #4706

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a0171f
feat(packet): get next send sequence for transfer packets
dzmitry-lahoda Sep 18, 2023
7e5fcba
Merge branch 'main' into dz/1
dzmitry-lahoda Sep 18, 2023
fca141b
Merge branch 'main' into dz/1
dzmitry-lahoda Sep 18, 2023
3645587
chore(channels): fixed tests for unordered sequence
dzmitry-lahoda Sep 18, 2023
bea8a6a
Merge branch 'main' into dz/1
dzmitry-lahoda Sep 18, 2023
9996c7d
Update modules/core/04-channel/keeper/grpc_query_test.go
dzmitry-lahoda Sep 19, 2023
b326128
Merge branch 'main' into dz/1
dzmitry-lahoda Sep 19, 2023
50e3edc
chore: removed useless error handling
dzmitry-lahoda Sep 19, 2023
88f88b1
Merge branch 'main' into dz/1
dzmitry-lahoda Sep 19, 2023
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
18 changes: 7 additions & 11 deletions modules/core/04-channel/keeper/grpc_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,25 +555,21 @@ func (k Keeper) NextSequenceSend(c context.Context, req *types.QueryNextSequence

ctx := sdk.UnwrapSDKContext(c)

channel, found := k.GetChannel(ctx, req.PortId, req.ChannelId)
_, found := k.GetChannel(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
errorsmod.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
dzmitry-lahoda marked this conversation as resolved.
Show resolved Hide resolved

// Return the next sequence send for ordered channels. Unordered channels
// do not make use of the next sequence send.
var sequence uint64
if channel.Ordering != types.UNORDERED {
sequence, found = k.GetNextSequenceSend(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
errorsmod.Wrapf(types.ErrSequenceSendNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
sequence, found = k.GetNextSequenceSend(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
errorsmod.Wrapf(types.ErrSequenceSendNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
selfHeight := clienttypes.GetSelfHeight(ctx)
return types.NewQueryNextSequenceSendResponse(sequence, nil, selfHeight), nil
Expand Down
6 changes: 4 additions & 2 deletions modules/core/04-channel/keeper/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,12 +1620,14 @@ func (suite *KeeperTestSuite) TestQueryNextSequenceSend() {
false,
},
{
"basic success on unordered channel returns zero",
"basic success on unordered channel returns the set send sequence",
func() {
path := ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.Setup(path)

expSeq = 0
expSeq = 42
dzmitry-lahoda marked this conversation as resolved.
Show resolved Hide resolved
seq := uint64(42)
suite.chainA.App.GetIBCKeeper().ChannelKeeper.SetNextSequenceSend(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, seq)
req = &types.QueryNextSequenceSendRequest{
PortId: path.EndpointA.ChannelConfig.PortID,
ChannelId: path.EndpointA.ChannelID,
Expand Down
Loading