wip

Author: benesjan

yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.test.ts

@@ -35,8 +35,15 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
     return SiloedTag.compute(tag, app);
   }
 
-  function makeLog(blockHash: L2BlockHash, blockNumber: number, tag: Fr) {
-    return new TxScopedL2Log(TxHash.random(), 0, 0, BlockNumber(blockNumber), blockHash, PrivateLog.random(tag));
+  function makeLog(blockHash: Fr, blockNumber: number, tag: Fr) {
+    return new TxScopedL2Log(
+      TxHash.random(),
+      0,
+      0,
+      BlockNumber(blockNumber),
+      L2BlockHash.fromField(blockHash),
+      PrivateLog.random(tag),
+    );
   }
 
   beforeAll(async () => {
@@ -83,7 +90,6 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
 
     const logBlockTimestamp = currentTimestamp - 5000n; // not aged
     const logIndex = 5;
-    const logBlockHash = L2BlockHash.random();
     const logTag = await computeSiloedTagForIndex(logIndex);
     const logBlockHeader = makeBlockHeader(0, { timestamp: logBlockTimestamp });
 
@@ -95,18 +101,18 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
 
     // The log is finalized
     aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
-      return Promise.resolve(
-        tags.map((t: Fr) =>
-          t.equals(logTag.value) ? [makeLog(logBlockHash, finalizedBlockNumber, logTag.value)] : [],
+      return Promise.all(
+        tags.map(async (t: Fr) =>
+          t.equals(logTag.value) ? [makeLog(await logBlockHeader.hash(), finalizedBlockNumber, logTag.value)] : [],
         ),
       );
     });
 
-    aztecNode.getBlockHeaderByHash.mockImplementation((hash: Fr) => {
-      if (hash.toBigInt() === logBlockHash.toBigInt()) {
-        return Promise.resolve(logBlockHeader);
+    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
+      if (hash.equals(await logBlockHeader.hash())) {
+        return logBlockHeader;
       }
-      return Promise.resolve(undefined);
+      return undefined;
     });
 
     const logs = await loadPrivateLogsForSenderRecipientPair(
@@ -127,7 +133,6 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
 
     const logBlockTimestamp = currentTimestamp - BigInt(MAX_INCLUDE_BY_TIMESTAMP_DURATION) - 1000n; // aged
     const logIndex = 7;
-    const logBlockHash = L2BlockHash.random();
     const logTag = await computeSiloedTagForIndex(logIndex);
     const logBlockHeader = makeBlockHeader(0, { timestamp: logBlockTimestamp });
 
@@ -139,18 +144,18 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
 
     // The log is finalized
     aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
-      return Promise.resolve(
-        tags.map((t: Fr) =>
-          t.equals(logTag.value) ? [makeLog(logBlockHash, finalizedBlockNumber, logTag.value)] : [],
+      return Promise.all(
+        tags.map(async (t: Fr) =>
+          t.equals(logTag.value) ? [makeLog(await logBlockHeader.hash(), finalizedBlockNumber, logTag.value)] : [],
         ),
       );
     });
 
-    aztecNode.getBlockHeaderByHash.mockImplementation((hash: Fr) => {
-      if (hash.toBigInt() === logBlockHash.toBigInt()) {
-        return Promise.resolve(logBlockHeader);
+    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
+      if (hash.equals(await logBlockHeader.hash())) {
+        return logBlockHeader;
       }
-      return Promise.resolve(undefined);
+      return undefined;
     });
 
     const logs = await loadPrivateLogsForSenderRecipientPair(
@@ -175,8 +180,6 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
     const highestFinalizedIndex = 5;
     const log1Index = highestAgedIndex + 1; // At the beginning of the range
     const log2Index = highestFinalizedIndex + WINDOW_LEN; // At the window boundary
-    const log1BlockHash = L2BlockHash.random();
-    const log2BlockHash = L2BlockHash.random();
     const log1Tag = await computeSiloedTagForIndex(log1Index);
     const log2Tag = await computeSiloedTagForIndex(log2Index);
     const log1BlockHeader = makeBlockHeader(0, { timestamp: log1BlockTimestamp });
@@ -197,25 +200,25 @@ describe('loadPrivateLogsForSenderRecipientPair', () => {
 
     aztecNode.getLogsByTags.mockImplementation((tags: Fr[]) => {
       numQueriedTags += tags.length;
-      return Promise.resolve(
-        tags.map((t: Fr) => {
+      return Promise.all(
+        tags.map(async (t: Fr) => {
           if (t.equals(log1Tag.value)) {
-            return [makeLog(log1BlockHash, finalizedBlockNumber, log1Tag.value)];
+            return [makeLog(await log1BlockHeader.hash(), finalizedBlockNumber, log1Tag.value)];
           } else if (t.equals(log2Tag.value)) {
-            return [makeLog(log2BlockHash, finalizedBlockNumber, log2Tag.value)];
+            return [makeLog(await log2BlockHeader.hash(), finalizedBlockNumber, log2Tag.value)];
           }
           return [];
         }),
       );
     });
 
-    aztecNode.getBlockHeaderByHash.mockImplementation((hash: Fr) => {
-      if (hash.toBigInt() === log1BlockHash.toBigInt()) {
-        return Promise.resolve(log1BlockHeader);
-      } else if (hash.toBigInt() === log2BlockHash.toBigInt()) {
-        return Promise.resolve(log2BlockHeader);
+    aztecNode.getBlockHeaderByHash.mockImplementation(async (hash: Fr) => {
+      if (hash.equals(await log1BlockHeader.hash())) {
+        return log1BlockHeader;
+      } else if (hash.equals(await log2BlockHeader.hash())) {
+        return log2BlockHeader;
       }
-      return Promise.resolve(undefined);
+      return undefined;
     });
 
     const logs = await loadPrivateLogsForSenderRecipientPair(