Skip to content

Commit

Permalink
fix(zetacore): add default cctx list pagination size (#2871)
Browse files Browse the repository at this point in the history
* fix(zetacore): add default cctx list pagination size

* add unit tests
  • Loading branch information
gartnera committed Sep 18, 2024
1 parent 102b872 commit a2be39f
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
9 changes: 9 additions & 0 deletions x/crosschain/keeper/grpc_query_cctx.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ const (

// MaxLookbackNonce is the maximum number of nonces to look back to find missed pending cctxs
MaxLookbackNonce = 1000

DefaultPageSize = 100
)

func (k Keeper) ZetaAccounting(
Expand All @@ -46,6 +48,13 @@ func (k Keeper) CctxAll(c context.Context, req *types.QueryAllCctxRequest) (*typ
store := ctx.KVStore(k.storeKey)
sendStore := prefix.NewStore(store, types.KeyPrefix(types.CCTXKey))

if req.Pagination == nil {
req.Pagination = &query.PageRequest{}
}
if req.Pagination.Limit == 0 {
req.Pagination.Limit = DefaultPageSize
}

pageRes, err := query.Paginate(sendStore, req.Pagination, func(_ []byte, value []byte) error {
var send types.CrossChainTx
if err := k.cdc.Unmarshal(value, &send); err != nil {
Expand Down
38 changes: 38 additions & 0 deletions x/crosschain/keeper/grpc_query_cctx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/stretchr/testify/require"

keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
Expand Down Expand Up @@ -288,3 +289,40 @@ func TestKeeper_CctxByNonce(t *testing.T) {
require.Equal(t, res.CrossChainTx.CctxStatus.LastUpdateTimestamp, ctx.BlockTime().Unix())
})
}

func TestKeeper_CctxAll(t *testing.T) {
t.Run("empty request", func(t *testing.T) {
k, ctx, _, _ := keepertest.CrosschainKeeper(t)
_, err := k.CctxAll(ctx, &types.QueryAllCctxRequest{})
require.NoError(t, err)
})

t.Run("default page size", func(t *testing.T) {
k, ctx, _, zk := keepertest.CrosschainKeeper(t)
chainID := getValidEthChainID()
tss := sample.Tss()
zk.ObserverKeeper.SetTSS(ctx, tss)
_ = createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss, zk)

res, err := k.CctxAll(ctx, &types.QueryAllCctxRequest{})
require.NoError(t, err)
require.Len(t, res.CrossChainTx, keeper.DefaultPageSize)
})

t.Run("page size provided", func(t *testing.T) {
k, ctx, _, zk := keepertest.CrosschainKeeper(t)
chainID := getValidEthChainID()
tss := sample.Tss()
zk.ObserverKeeper.SetTSS(ctx, tss)
_ = createCctxWithNonceRange(t, ctx, *k, 1000, 2000, chainID, tss, zk)
testPageSize := 200

res, err := k.CctxAll(ctx, &types.QueryAllCctxRequest{
Pagination: &query.PageRequest{
Limit: uint64(testPageSize),
},
})
require.NoError(t, err)
require.Len(t, res.CrossChainTx, testPageSize)
})
}

0 comments on commit a2be39f

Please sign in to comment.