Revert "fix: report status of note processor catching up"

This reverts commit 676c083.
AztecProtocol · Nov 6, 2023 · 0026b7e · 0026b7e
1 parent 676c083
commit 0026b7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts
@@ -1,7 +1,7 @@
 import { CompleteAddress, Fr, GrumpkinScalar, HistoricBlockData } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { TestKeyStore } from '@aztec/key-store';
-import { AztecNode, L2Block, MerkleTreeId } from '@aztec/types';
+import { AztecNode, INITIAL_L2_BLOCK_NUM, L2Block, MerkleTreeId } from '@aztec/types';
 
 import { MockProxy, mock } from 'jest-mock-extended';
 import omit from 'lodash.omit';
@@ -99,7 +99,7 @@ describe('Synchronizer', () => {
     await synchronizer.work();
 
     // Used in synchronizer.isAccountStateSynchronized
-    aztecNode.getBlockNumber.mockResolvedValue(1);
+    aztecNode.getBlockNumber.mockResolvedValueOnce(1);
 
     // Manually adding account to database so that we can call synchronizer.isAccountStateSynchronized
     const keyStore = new TestKeyStore(await Grumpkin.new());
@@ -109,25 +109,11 @@ describe('Synchronizer', () => {
     await database.addCompleteAddress(completeAddress);
 
     // Add the account which will add the note processor to the synchronizer
-    synchronizer.addAccount(completeAddress.publicKey, keyStore, 1);
-
-    expect(await synchronizer.isAccountStateSynchronized(completeAddress.address)).toBe(false);
-    expect(synchronizer.getSyncStatus()).toEqual({
-      blocks: 1,
-      notes: {
-        [completeAddress.publicKey.toString()]: 0,
-      },
-    });
+    synchronizer.addAccount(completeAddress.publicKey, keyStore, INITIAL_L2_BLOCK_NUM);
 
     await synchronizer.workNoteProcessorCatchUp();
 
     expect(await synchronizer.isAccountStateSynchronized(completeAddress.address)).toBe(true);
-    expect(synchronizer.getSyncStatus()).toEqual({
-      blocks: 1,
-      notes: {
-        [completeAddress.publicKey.toString()]: 1,
-      },
-    });
   });
 });
 

diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.ts b/yarn-project/pxe/src/synchronizer/synchronizer.ts
@@ -288,12 +288,7 @@ export class Synchronizer {
   public getSyncStatus() {
     return {
       blocks: this.synchedToBlock,
-      notes: Object.fromEntries(
-        [...this.noteProcessors, ...this.noteProcessorsToCatchUp].map(n => [
-          n.publicKey.toString(),
-          n.status.syncedToBlock,
-        ]),
-      ),
+      notes: Object.fromEntries(this.noteProcessors.map(n => [n.publicKey.toString(), n.status.syncedToBlock])),
     };
   }
 }