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

imp: add page result to ics29-fee queries #3054

Merged
merged 12 commits into from
Feb 8, 2023
Merged

imp: add page result to ics29-fee queries #3054

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4930faa
feat: update proto files
aleem1314 Jan 25, 2023
8c2553b
feat: run make proto-gen
aleem1314 Jan 25, 2023
5c2e26f
run make proto-gen
aleem1314 Jan 25, 2023
27857a0
update query.proto
aleem1314 Jan 25, 2023
cae86f3
chore: add pagination result
aleem1314 Jan 25, 2023
35930ea
chore: update `QueryFeeEnabledChannelsResponse`
aleem1314 Jan 25, 2023
5eb6f51
chore: run make proto-gen
aleem1314 Jan 25, 2023
05669cb
Merge main into aleem/2894-fee-queries-pagination
aleem1314 Jan 28, 2023
ef6ba12
chore: make proto-gen
aleem1314 Jan 28, 2023
2752d52
Merge branch 'main' into aleem/2894-fee-queries-pagination
aleem1314 Jan 30, 2023
0e0d32c
Merge branch 'main' into aleem/2894-fee-queries-pagination
Feb 8, 2023
350fb19
Merge branch 'main' into aleem/2894-fee-queries-pagination
Feb 8, 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
9 changes: 6 additions & 3 deletions modules/apps/29-fee/keeper/grpc_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (k Keeper) IncentivizedPackets(goCtx context.Context, req *types.QueryIncen

var identifiedPackets []types.IdentifiedPacketFees
store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte(types.FeesInEscrowPrefix))
_, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
pagination, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
packetID, err := types.ParseKeyFeesInEscrow(types.FeesInEscrowPrefix + string(key))
if err != nil {
return err
Expand All @@ -41,6 +41,7 @@ func (k Keeper) IncentivizedPackets(goCtx context.Context, req *types.QueryIncen

return &types.QueryIncentivizedPacketsResponse{
IncentivizedPackets: identifiedPackets,
Pagination: pagination,
}, nil
}

Expand Down Expand Up @@ -75,7 +76,7 @@ func (k Keeper) IncentivizedPacketsForChannel(goCtx context.Context, req *types.
var packets []*types.IdentifiedPacketFees
keyPrefix := types.KeyFeesInEscrowChannelPrefix(req.PortId, req.ChannelId)
store := prefix.NewStore(ctx.KVStore(k.storeKey), keyPrefix)
_, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
pagination, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
packetID, err := types.ParseKeyFeesInEscrow(string(keyPrefix) + string(key))
if err != nil {
return err
Expand All @@ -94,6 +95,7 @@ func (k Keeper) IncentivizedPacketsForChannel(goCtx context.Context, req *types.

return &types.QueryIncentivizedPacketsForChannelResponse{
IncentivizedPackets: packets,
Pagination: pagination,
}, nil
}

Expand Down Expand Up @@ -217,7 +219,7 @@ func (k Keeper) FeeEnabledChannels(goCtx context.Context, req *types.QueryFeeEna

var feeEnabledChannels []types.FeeEnabledChannel
store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte(types.FeeEnabledKeyPrefix))
_, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
pagination, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
portID, channelID, err := types.ParseKeyFeeEnabled(types.FeeEnabledKeyPrefix + string(key))
if err != nil {
return err
Expand All @@ -238,6 +240,7 @@ func (k Keeper) FeeEnabledChannels(goCtx context.Context, req *types.QueryFeeEna

return &types.QueryFeeEnabledChannelsResponse{
FeeEnabledChannels: feeEnabledChannels,
Pagination: pagination,
}, nil
}

Expand Down
Loading