review fixes

penumbra-zone · Mar 12, 2024 · 0c83895 · 0c83895
1 parent 352e749
commit 0c83895
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/packages/storage/src/indexed-db/index.ts b/packages/storage/src/indexed-db/index.ts
@@ -210,28 +210,17 @@ export class IndexedDb implements IndexedDbInterface {
   }
 
   async *iterateTransactions() {
-    yield* new ReadableStream({
-      start: async cont => {
-        let cursor = await this.db.transaction('TRANSACTIONS').store.openCursor();
-        while (cursor) {
-          cont.enqueue(TransactionInfo.fromJson(cursor.value));
-          cursor = await cursor.continue();
-        }
-        cont.close();
-      },
-    });
+    yield* new ReadableStream(
+      new IdbCursorSource(this.db.transaction('TRANSACTIONS').store.openCursor(), TransactionInfo),
+    );
   }
 
   async saveTransaction(
     id: TransactionId,
     height: bigint,
     transaction: Transaction,
   ): Promise<void> {
-    const tx = new TransactionInfo({
-      id,
-      height,
-      transaction,
-    });
+    const tx = new TransactionInfo({ id, height, transaction });
     await this.u.update({
       table: 'TRANSACTIONS',
       value: tx.toJson() as Jsonified<TransactionInfo>,

diff --git a/packages/storage/src/indexed-db/indexed-db.test.ts b/packages/storage/src/indexed-db/indexed-db.test.ts
@@ -139,7 +139,7 @@ describe('IndexedDb', () => {
       await db.saveTransaction(transactionId, 1000n, transaction);
       const txs: TransactionInfo[] = [];
       for await (const tx of db.iterateTransactions()) {
-        txs.push(tx as TransactionInfo);
+        txs.push(tx);
       }
       expect(txs.length).toBe(1);
 
@@ -181,7 +181,7 @@ describe('IndexedDb', () => {
 
       const txsAfterClean: TransactionInfo[] = [];
       for await (const tx of db.iterateTransactions()) {
-        txsAfterClean.push(tx as TransactionInfo);
+        txsAfterClean.push(tx);
       }
       expect(txsAfterClean.length).toBe(0);
       expect(await db.getFullSyncHeight()).toBeUndefined();
@@ -323,7 +323,7 @@ describe('IndexedDb', () => {
       await db.saveTransaction(transactionId, 1000n, transaction);
       const savedTransactions: TransactionInfo[] = [];
       for await (const tx of db.iterateTransactions()) {
-        savedTransactions.push(tx as TransactionInfo);
+        savedTransactions.push(tx);
       }
       expect(savedTransactions.length === 1).toBeTruthy();
       expect(transaction.equals(savedTransactions[0]?.transaction)).toBeTruthy();