wip

Author: benesjan

yarn-project/pxe/src/tagging/recipient_sync/utils/load_logs_for_range.test.ts

@@ -60,38 +60,7 @@ describe('loadLogsForRange', () => {
     expect(await loadLogsForRange(secret, app, aztecNode, 0, 10, NON_INTERFERING_ANCHOR_BLOCK_NUMBER)).toHaveLength(0);
   });
 
-  it('returns logs with block timestamps and tagging indexes for a single log', async () => {
-    const txHash = TxHash.random();
-    const blockNumber = 5;
-    const index = 3;
-    const timestamp = 1000n;
-    const tag = await computeSiloedTagForIndex(index);
-    const blockHeader = makeBlockHeader(0, { timestamp });
-
-    aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
-      return Promise.all(
-        tags.map(async (t: Fr) =>
-          t.equals(tag.value) ? [makeLog(txHash, await blockHeader.hash(), blockNumber, tag)] : [],
-        ),
-      );
-    });
-
-    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
-      if (hash.equals(await blockHeader.hash())) {
-        return blockHeader;
-      }
-      return undefined;
-    });
-
-    const result = await loadLogsForRange(secret, app, aztecNode, 0, 10, NON_INTERFERING_ANCHOR_BLOCK_NUMBER);
-
-    expect(result).toHaveLength(1);
-    expect(result[0].log.txHash.equals(txHash)).toBe(true);
-    expect(result[0].blockTimestamp).toBe(timestamp);
-    expect(result[0].taggingIndex).toBe(index);
-  });
-
-  it('filters out public logs and only returns private logs', async () => {
+  it('only returns private logs', async () => {
     const txHash = TxHash.random();
     const blockNumber = 5;
     const index = 3;
@@ -175,6 +144,50 @@ describe('loadLogsForRange', () => {
     expect(resultByIndex[1].log.txHash.equals(txHash2)).toBe(true);
   });
 
+  it('handles multiple logs at the same index', async () => {
+    const txHash1 = TxHash.random();
+    const txHash2 = TxHash.random();
+    const blockNumber1 = 5;
+    const blockNumber2 = 6;
+    const index = 4;
+    const timestamp1 = 1000n;
+    const timestamp2 = 2000n;
+    const tag = await computeSiloedTagForIndex(index);
+    const blockHeader1 = makeBlockHeader(0, { timestamp: timestamp1 });
+    const blockHeader2 = makeBlockHeader(1, { timestamp: timestamp2 });
+
+    aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
+      return Promise.all(
+        tags.map(async (t: Fr) =>
+          t.equals(tag.value)
+            ? [
+                makeLog(txHash1, await blockHeader1.hash(), blockNumber1, tag),
+                makeLog(txHash2, await blockHeader2.hash(), blockNumber2, tag),
+              ]
+            : [],
+        ),
+      );
+    });
+
+    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
+      if (hash.equals(await blockHeader1.hash())) {
+        return blockHeader1;
+      } else if (hash.equals(await blockHeader2.hash())) {
+        return blockHeader2;
+      }
+      return undefined;
+    });
+
+    const result = await loadLogsForRange(secret, app, aztecNode, 0, 10, NON_INTERFERING_ANCHOR_BLOCK_NUMBER);
+
+    expect(result).toHaveLength(2);
+    expect(result[0].taggingIndex).toBe(index);
+    expect(result[1].taggingIndex).toBe(index);
+    const txHashes = result.map(r => r.log.txHash.toString());
+    expect(txHashes).toContain(txHash1.toString());
+    expect(txHashes).toContain(txHash2.toString());
+  });
+
   it('handles multiple logs in the same block', async () => {
     const txHash1 = TxHash.random();
     const txHash2 = TxHash.random();
@@ -299,51 +312,7 @@ describe('loadLogsForRange', () => {
     expect(result[0].taggingIndex).toBe(index2);
   });
 
-  it('handles multiple logs at the same index', async () => {
-    const txHash1 = TxHash.random();
-    const txHash2 = TxHash.random();
-    const blockNumber1 = 5;
-    const blockNumber2 = 6;
-    const index = 4;
-    const timestamp1 = 1000n;
-    const timestamp2 = 2000n;
-    const tag = await computeSiloedTagForIndex(index);
-    const blockHeader1 = makeBlockHeader(0, { timestamp: timestamp1 });
-    const blockHeader2 = makeBlockHeader(1, { timestamp: timestamp2 });
-
-    aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
-      return Promise.all(
-        tags.map(async (t: Fr) =>
-          t.equals(tag.value)
-            ? [
-                makeLog(txHash1, await blockHeader1.hash(), blockNumber1, tag),
-                makeLog(txHash2, await blockHeader2.hash(), blockNumber2, tag),
-              ]
-            : [],
-        ),
-      );
-    });
-
-    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
-      if (hash.equals(await blockHeader1.hash())) {
-        return blockHeader1;
-      } else if (hash.equals(await blockHeader2.hash())) {
-        return blockHeader2;
-      }
-      return undefined;
-    });
-
-    const result = await loadLogsForRange(secret, app, aztecNode, 0, 10, NON_INTERFERING_ANCHOR_BLOCK_NUMBER);
-
-    expect(result).toHaveLength(2);
-    expect(result[0].taggingIndex).toBe(index);
-    expect(result[1].taggingIndex).toBe(index);
-    const txHashes = result.map(r => r.log.txHash.toString());
-    expect(txHashes).toContain(txHash1.toString());
-    expect(txHashes).toContain(txHash2.toString());
-  });
-
-  it('filters out logs from blocks after anchor block number', async () => {
+  it('filters out logs from blocks after anchor block', async () => {
     const anchorBlockNumber = 10;
 
     const index = 3;