fix: include pagination.key at reverse mode (#20939)

This commit is contained in:
beer-1 2024-07-15 20:39:20 +09:00 committed by GitHub
parent df4214a153
commit 3395906d1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions

View File

@ -118,6 +118,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
* [#19833](https://github.com/cosmos/cosmos-sdk/pull/19833) Fix some places in which we call Remove inside a Walk.
* [#19851](https://github.com/cosmos/cosmos-sdk/pull/19851) Fix some places in which we call Remove inside a Walk (x/staking and x/gov).
* [#20631](https://github.com/cosmos/cosmos-sdk/pull/20631) Fix json parsing in the wait-tx command.
* [#20939](https://github.com/cosmos/cosmos-sdk/pull/20939) Fix collection reverse iterator to include `pagination.key` in the result.
### API Breaking Changes

View File

@ -330,11 +330,11 @@ func encodeCollKey[K, V any, C Collection[K, V]](coll C, key K) ([]byte, error)
func getCollIter[K, V any, C Collection[K, V]](ctx context.Context, coll C, prefix, start []byte, reverse bool) (collections.Iterator[K, V], error) {
// TODO: maybe can be simplified
if reverse {
var end []byte
if prefix != nil {
start = storetypes.PrefixEndBytes(append(prefix, start...))
end = prefix
}
// if we are in reverse mode, we need to increase the start key
// to include the start key in the iteration.
start = storetypes.PrefixEndBytes(append(prefix, start...))
end := prefix
return coll.IterateRaw(ctx, end, start, collections.OrderDescending)
}
var end []byte

View File

@ -83,6 +83,16 @@ func TestCollectionPagination(t *testing.T) {
},
expResults: createResults(299, 200),
},
"with key and reverse": {
req: &PageRequest{
Key: encodeKey(199),
Reverse: true,
},
expResp: &PageResponse{
NextKey: encodeKey(99),
},
expResults: createResults(199, 100),
},
"with offset and count total": {
req: &PageRequest{
Offset: 50,