@powersync/service-core-tests 0.17.2 → 0.18.0

package/dist/tests/register-data-storage-data-tests.js

@@ -52,9 +52,9 @@ bucket_definitions:
             beforeReplicaId: test_utils.rid('test1')
         });
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -68,9 +68,7 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -107,9 +105,9 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test1')
         });
         await writer.commit('2/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -119,9 +117,7 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -163,9 +159,9 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test1')
         });
         await writer.commit('2/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -175,9 +171,7 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -215,9 +209,9 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test1')
         });
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -227,9 +221,7 @@ bucket_definitions:
         });
         const c1 = 2871785649;
         expect(data).toEqual([{ op: 'PUT', object_id: 'test1', checksum: c1 }]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: request.bucket,
@@ -289,9 +281,9 @@ bucket_definitions:
             });
             await writer.commit('2/1');
         }
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         expect(reduceBucket(batch[0].chunkData.data).slice(1)).toEqual([]);
         const data = batch[0].chunkData.data.map((d) => {
             return {
@@ -347,8 +339,8 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test2')
         });
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [bucketRequest(syncRules, 'global[]')]));
+        const checkpoint = await bucketStorage.getCheckpoint();
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [bucketRequest(syncRules, 'global[]')]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -398,9 +390,9 @@ bucket_definitions:
             beforeReplicaId: test_utils.rid('test1')
         });
         await writer.flush();
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -414,9 +406,7 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -497,9 +487,9 @@ bucket_definitions:
             beforeReplicaId: test_utils.rid('test1')
         });
         await writer.commit('2/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -515,9 +505,7 @@ bucket_definitions:
             { op: 'PUT', object_id: 'test1', checksum: c1 },
             { op: 'REMOVE', object_id: 'test1', checksum: c2 }
         ]);
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([
             {
                 bucket: bucketRequest(syncRules, 'global[]').bucket,
@@ -639,7 +627,7 @@ bucket_definitions:
         const result2 = await writer.flush();
         const checkpoint2 = result2.flushed_op;
         const request = bucketRequest(syncRules, 'global[]', checkpoint1);
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint2), [request]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint2), [request]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -725,7 +713,7 @@ bucket_definitions:
         const result3 = await writer.flush();
         const checkpoint3 = result3.flushed_op;
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -821,7 +809,7 @@ bucket_definitions:
         const result3 = await writer.flush();
         const checkpoint3 = result3.flushed_op;
         const request = bucketRequest(syncRules, 'global[]');
-        const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
+        const batch = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint3), [{ ...request, start: checkpoint1 }]));
         const data = batch[0].chunkData.data.map((d) => {
             return {
                 op: d.op,
@@ -905,12 +893,12 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test3')
         });
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const options = {
             chunkLimitBytes: 16 * 1024 * 1024
         };
         const request = bucketRequest(syncRules, 'global[]');
-        const batch1 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request], options));
+        const batch1 = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [request], options));
         expect(test_utils.getBatchData(batch1)).toEqual([
             { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
             { op_id: '2', op: 'PUT', object_id: 'large1', checksum: 454746904 }
@@ -920,7 +908,7 @@ bucket_definitions:
             has_more: true,
             next_after: '2'
         });
-        const batch2 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch1[0].chunkData.next_after) }], options));
+        const batch2 = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1[0].chunkData.next_after) }], options));
         expect(test_utils.getBatchData(batch2)).toEqual([
             { op_id: '3', op: 'PUT', object_id: 'large2', checksum: 1795508474 },
             { op_id: '4', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
@@ -930,12 +918,13 @@ bucket_definitions:
             has_more: false,
             next_after: '4'
         });
-        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch2[0].chunkData.next_after) }], options));
+        const batch3 = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2[0].chunkData.next_after) }], options));
         expect(test_utils.getBatchData(batch3)).toEqual([]);
         expect(test_utils.getBatchMeta(batch3)).toEqual(null);
     });
     test('long batch', async () => {
-        // Test syncing a batch of data that is limited by count.
+        // Test syncing a batch of data that is limited by count. Compressed storage limits persisted
+        // documents and finishes yielding all operations from a document once it has been hydrated.
         await using factory = await generateStorageFactory();
         const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
@@ -961,40 +950,55 @@ bucket_definitions:
             });
         }
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const batch1 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [request], { limit: 4 }));
-        expect(test_utils.getBatchData(batch1)).toEqual([
+        const batch1 = await test_utils.getSingleBatchItem(bucketStorage.getBucketDataBatch(checkpoint, [request], { limit: 4 }));
+        const allOperations = [
             { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 },
             { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
             { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 },
-            { op_id: '4', op: 'PUT', object_id: 'test4', checksum: 2049153252 }
-        ]);
-        expect(test_utils.getBatchMeta(batch1)).toEqual({
-            after: '0',
-            has_more: true,
-            next_after: '4'
-        });
-        const batch2 = await test_utils.oneFromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
-            limit: 4
-        }));
-        expect(test_utils.getBatchData(batch2)).toEqual([
+            { op_id: '4', op: 'PUT', object_id: 'test4', checksum: 2049153252 },
             { op_id: '5', op: 'PUT', object_id: 'test5', checksum: 3686902721 },
             { op_id: '6', op: 'PUT', object_id: 'test6', checksum: 1974820016 }
-        ]);
-        expect(test_utils.getBatchMeta(batch2)).toEqual({
-            after: '4',
-            has_more: false,
-            next_after: '6'
-        });
-        const batch3 = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [{ ...request, start: BigInt(batch2.chunkData.next_after) }], {
-            limit: 4
-        }));
-        expect(test_utils.getBatchData(batch3)).toEqual([]);
-        expect(test_utils.getBatchMeta(batch3)).toEqual(null);
+        ];
+        if (config.compressedBucketStorage) {
+            expect(test_utils.getBatchData(batch1)).toEqual(allOperations);
+            expect(test_utils.getBatchMeta(batch1)).toEqual({
+                after: '0',
+                has_more: false,
+                next_after: '6'
+            });
+            const batch2 = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
+                limit: 4
+            }));
+            expect(test_utils.getBatchData(batch2)).toEqual([]);
+            expect(test_utils.getBatchMeta(batch2)).toEqual(null);
+        }
+        else {
+            expect(test_utils.getBatchData(batch1)).toEqual(allOperations.slice(0, 4));
+            expect(test_utils.getBatchMeta(batch1)).toEqual({
+                after: '0',
+                has_more: true,
+                next_after: '4'
+            });
+            const batch2 = await test_utils.getSingleBatchItem(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch1.chunkData.next_after) }], {
+                limit: 4
+            }));
+            expect(test_utils.getBatchData(batch2)).toEqual(allOperations.slice(4));
+            expect(test_utils.getBatchMeta(batch2)).toEqual({
+                after: '4',
+                has_more: false,
+                next_after: '6'
+            });
+            const batch3 = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(checkpoint, [{ ...request, start: BigInt(batch2.chunkData.next_after) }], {
+                limit: 4
+            }));
+            expect(test_utils.getBatchData(batch3)).toEqual([]);
+            expect(test_utils.getBatchMeta(batch3)).toEqual(null);
+        }
     });
     describe('batch has_more', () => {
-        const setup = async (options) => {
+        const setup = async (options, commitAfter) => {
             await using factory = await generateStorageFactory();
             const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
   bucket_definitions:
@@ -1020,28 +1024,39 @@ bucket_definitions:
                     },
                     afterReplicaId: `test${i}`
                 });
+                if (i == commitAfter) {
+                    await writer.commit('1/1');
+                }
             }
-            await writer.commit('1/1');
-            const { checkpoint } = await bucketStorage.getCheckpoint();
+            await writer.commit(commitAfter == null ? '1/1' : '1/2');
+            const checkpoint = await bucketStorage.getCheckpoint();
             const global1Request = bucketRequest(syncRules, 'global1[]', 0n);
             const global2Request = bucketRequest(syncRules, 'global2[]', 0n);
-            const batch = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(checkpoint), [global1Request, global2Request], options));
+            const batch = await new test_utils.StorageDataHelpers(bucketStorage, syncRules).getAllBucketData([global1Request, global2Request], checkpoint, options);
             return { batch, global1Request, global2Request };
         };
         test('batch has_more (1)', async () => {
-            const { batch, global1Request, global2Request } = await setup({ limit: 5 });
-            expect(batch.length).toEqual(2);
+            // The commit boundary creates two compressed documents for global2. The limit selects the global1
+            // document and the first global2 document, leaving the second global2 document for the next batch.
+            const { batch, global1Request, global2Request } = await setup({ limit: 2 }, 5);
+            expect(batch.length).toBeGreaterThanOrEqual(2);
             expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
             expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
             expect(test_utils.getBatchData(batch[0])).toEqual([
                 { op_id: '1', op: 'PUT', object_id: 'test1', checksum: 2871785649 }
             ]);
-            expect(test_utils.getBatchData(batch[1])).toEqual([
+            const global2Operations = [
                 { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
                 { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 },
                 { op_id: '4', op: 'PUT', object_id: 'test4', checksum: 2049153252 },
-                { op_id: '5', op: 'PUT', object_id: 'test5', checksum: 3686902721 }
-            ]);
+                { op_id: '5', op: 'PUT', object_id: 'test5', checksum: 3686902721 },
+                { op_id: '6', op: 'PUT', object_id: 'test6', checksum: 1974820016 },
+                { op_id: '7', op: 'PUT', object_id: 'test7', checksum: 2477637855 },
+                { op_id: '8', op: 'PUT', object_id: 'test8', checksum: 3644033632 },
+                { op_id: '9', op: 'PUT', object_id: 'test9', checksum: 1011055869 },
+                { op_id: '10', op: 'PUT', object_id: 'test10', checksum: 1331456365 }
+            ];
+            expect(test_utils.getBatchData(batch[1])).toEqual(config.compressedBucketStorage ? global2Operations.slice(0, 4) : global2Operations.slice(0, 1));
             expect(test_utils.getBatchMeta(batch[0])).toEqual({
                 after: '0',
                 has_more: false,
@@ -1050,7 +1065,7 @@ bucket_definitions:
             expect(test_utils.getBatchMeta(batch[1])).toEqual({
                 after: '0',
                 has_more: true,
-                next_after: '5'
+                next_after: config.compressedBucketStorage ? '5' : '2'
             });
         });
         test('batch has_more (2)', async () => {
@@ -1087,7 +1102,8 @@ bucket_definitions:
             // 50 bytes is more than 1 row, less than 2 rows
             const { batch, global1Request, global2Request } = await setup({ limit: 3, chunkLimitBytes: 50 });
             if (config.compressedBucketStorage) {
-                // In v3+, ops in the same bucket share a document, so ops 2 and 3 (global2) are batched together
+                // In v3+, ops in the same bucket share a document. Once hydrated, the entire document is yielded even
+                // when it exceeds the byte limit; the byte limit controls whether another document is fetched.
                 expect(batch.length).toEqual(2);
                 expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
                 expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
@@ -1096,7 +1112,14 @@ bucket_definitions:
                 ]);
                 expect(test_utils.getBatchData(batch[1])).toEqual([
                     { op_id: '2', op: 'PUT', object_id: 'test2', checksum: 730027011 },
-                    { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 }
+                    { op_id: '3', op: 'PUT', object_id: 'test3', checksum: 1359888332 },
+                    { op_id: '4', op: 'PUT', object_id: 'test4', checksum: 2049153252 },
+                    { op_id: '5', op: 'PUT', object_id: 'test5', checksum: 3686902721 },
+                    { op_id: '6', op: 'PUT', object_id: 'test6', checksum: 1974820016 },
+                    { op_id: '7', op: 'PUT', object_id: 'test7', checksum: 2477637855 },
+                    { op_id: '8', op: 'PUT', object_id: 'test8', checksum: 3644033632 },
+                    { op_id: '9', op: 'PUT', object_id: 'test9', checksum: 1011055869 },
+                    { op_id: '10', op: 'PUT', object_id: 'test10', checksum: 1331456365 }
                 ]);
                 expect(test_utils.getBatchMeta(batch[0])).toEqual({
                     after: '0',
@@ -1105,12 +1128,12 @@ bucket_definitions:
                 });
                 expect(test_utils.getBatchMeta(batch[1])).toEqual({
                     after: '0',
-                    has_more: true,
-                    next_after: '3'
+                    has_more: false,
+                    next_after: '10'
                 });
             }
             else {
-                expect(batch.length).toEqual(3);
+                expect(batch.length).toBeGreaterThanOrEqual(3);
                 expect(batch[0].chunkData.bucket).toEqual(global1Request.bucket);
                 expect(batch[1].chunkData.bucket).toEqual(global2Request.bucket);
                 expect(batch[2].chunkData.bucket).toEqual(global2Request.bucket);
@@ -1225,21 +1248,19 @@ bucket_definitions:
             afterReplicaId: test_utils.rid('test1')
         });
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         const request = bucketRequest(syncRules, 'global[]');
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), [request])).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, [request])).values()];
         expect(checksums).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
         const checksums2 = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint + 1n), [request])).values()
+            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint.checkpoint + 1n), [request])).values()
         ];
         expect(checksums2).toEqual([{ bucket: request.bucket, checksum: 1917136889, count: 1 }]);
     });
     testChecksumBatching(config);
     test('empty checkpoints (1)', async () => {
         await using factory = await generateStorageFactory();
-        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
+        const { stream: replicationStream } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1265,7 +1286,7 @@ bucket_definitions:
     });
     test('empty checkpoints (2)', async () => {
         await using factory = await generateStorageFactory();
-        const { stream: replicationStream, content: syncRules } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
+        const { stream: replicationStream } = await test_utils.deploySyncRules(factory, updateSyncRulesFromYaml(`
 bucket_definitions:
   global:
     data:
@@ -1385,7 +1406,7 @@ bucket_definitions:
         await streamingWriter.keepalive('3/1');
         const cp = await bucketStorage.getCheckpoint();
         expect(cp.lsn).toEqual('3/1');
-        const data = await test_utils.fromAsync(bucketStorage.getBucketDataBatch(test_utils.testCheckpoint(cp.checkpoint), [bucketRequest(syncRules, 'global[]')]));
+        const data = await test_utils.getBatchArray(bucketStorage.getBucketDataBatch(cp, [bucketRequest(syncRules, 'global[]')]));
         expect(data).toEqual([]);
     });
 }
@@ -1427,14 +1448,12 @@ bucket_definitions:
             }
         }
         await writer.commit('1/1');
-        const { checkpoint } = await bucketStorage.getCheckpoint();
+        const checkpoint = await bucketStorage.getCheckpoint();
         bucketStorage.clearChecksumCache();
         const users = ['u1', 'u2', 'u3', 'u4'];
         const expectedChecksums = [346204588, 5261081, 134760718, -302639724];
         const bucketRequests = users.map((user) => bucketRequest(syncRules, `user["${user}"]`));
-        const checksums = [
-            ...(await bucketStorage.getChecksums(test_utils.testCheckpoint(checkpoint), bucketRequests)).values()
-        ];
+        const checksums = [...(await bucketStorage.getChecksums(checkpoint, bucketRequests)).values()];
         checksums.sort((a, b) => a.bucket.localeCompare(b.bucket));
         const expected = bucketRequests.map((request, index) => ({
             bucket: request.bucket,