From 303d1309a37b5f4955a65ecaaa7164b29a9142bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= Date: Thu, 6 Mar 2025 19:33:13 +0000 Subject: [PATCH 1/2] rm unused methods --- .../note_data_provider.test.ts | 27 +++++-------------- .../note_data_provider/note_data_provider.ts | 14 ---------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts index d859bbfddf6b..12f0c9a92c9c 100644 --- a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts +++ b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts @@ -85,24 +85,13 @@ describe('NoteDataProvider', () => { } }); - it.each(filteringTests)('stores notes in bulk and retrieves notes', async (getFilter, getExpected) => { + it.each(filteringTests)('stores notes and retrieves notes', async (getFilter, getExpected) => { await noteDataProvider.addNotes(notes); const returnedNotes = await noteDataProvider.getNotes(await getFilter()); const expected = await getExpected(); expect(returnedNotes.sort()).toEqual(expected.sort()); }); - it.each(filteringTests)('stores notes one by one and retrieves notes', async (getFilter, getExpected) => { - for (const note of notes) { - await noteDataProvider.addNote(note); - } - - const returnedNotes = await noteDataProvider.getNotes(await getFilter()); - - const expected = await getExpected(); - expect(returnedNotes.sort()).toEqual(expected.sort()); - }); - it.each(filteringTests)('retrieves nullified notes', async (getFilter, getExpected) => { await noteDataProvider.addNotes(notes); @@ -188,14 +177,10 @@ describe('NoteDataProvider', () => { expect(result.sort()).toEqual([...notes].sort()); }); - it('stores notes one by one and retrieves notes with siloed account', async () => { - for (const note of notes.slice(0, 5)) { - await noteDataProvider.addNote(note, owners[0].address); - } + it('stores notes and retrieves notes with siloed account', async () => { + await noteDataProvider.addNotes(notes, owners[0].address); - for (const note of notes.slice(5)) { - await noteDataProvider.addNote(note, owners[1].address); - } + await noteDataProvider.addNotes(notes.slice(5), owners[1].address); const owner0Notes = await noteDataProvider.getNotes({ scopes: [owners[0].address], @@ -217,8 +202,8 @@ describe('NoteDataProvider', () => { }); it('a nullified note removes notes from all accounts in the pxe', async () => { - await noteDataProvider.addNote(notes[0], owners[0].address); - await noteDataProvider.addNote(notes[0], owners[1].address); + await noteDataProvider.addNotes([notes[0]], owners[0].address); + await noteDataProvider.addNotes([notes[0]], owners[1].address); await expect( noteDataProvider.getNotes({ diff --git a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.ts b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.ts index fe0865bef220..03965fa7cce9 100644 --- a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.ts +++ b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.ts @@ -84,10 +84,6 @@ export class NoteDataProvider implements DataProvider { return true; } - async addNote(note: NoteDao, scope?: AztecAddress): Promise { - await this.addNotes([note], scope); - } - async addNotes(notes: NoteDao[], scope: AztecAddress = AztecAddress.ZERO): Promise { if (!(await this.#scopes.hasAsync(scope.toString()))) { await this.addScope(scope); @@ -343,16 +339,6 @@ export class NoteDataProvider implements DataProvider { }); } - async addNullifiedNote(note: NoteDao): Promise { - const noteIndex = toBufferBE(note.index, 32).toString('hex'); - - await this.#nullifiedNotes.set(noteIndex, note.toBuffer()); - await this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex); - await this.#nullifiedNotesByStorageSlot.set(note.storageSlot.toString(), noteIndex); - await this.#nullifiedNotesByTxHash.set(note.txHash.toString(), noteIndex); - await this.#nullifiedNotesByAddressPoint.set(note.addressPoint.toString(), noteIndex); - } - async getSize() { return (await this.getNotes({})).reduce((sum, note) => sum + note.getSize(), 0); } From d9962241b26ed0a49239656a7517530a40c08bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= Date: Thu, 6 Mar 2025 21:39:02 +0000 Subject: [PATCH 2/2] Fix broken test --- .../src/storage/note_data_provider/note_data_provider.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts index 12f0c9a92c9c..9ef44eb9c8c8 100644 --- a/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts +++ b/yarn-project/pxe/src/storage/note_data_provider/note_data_provider.test.ts @@ -178,7 +178,7 @@ describe('NoteDataProvider', () => { }); it('stores notes and retrieves notes with siloed account', async () => { - await noteDataProvider.addNotes(notes, owners[0].address); + await noteDataProvider.addNotes(notes.slice(0, 5), owners[0].address); await noteDataProvider.addNotes(notes.slice(5), owners[1].address);