minor fixes (#492)

* minor fixes * fix test
l2beat · Sep 21, 2023 · 6fc8ce2 · 6fc8ce2
1 parent c4e9730
commit 6fc8ce2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/packages/backend/src/api/controllers/StateUpdateController.ts b/packages/backend/src/api/controllers/StateUpdateController.ts
@@ -67,7 +67,9 @@ export class StateUpdateController {
       l2Transactions,
     ] = await Promise.all([
       this.stateUpdateRepository.findById(stateUpdateId),
-      this.preprocessedStateDetailsRepository.findById(stateUpdateId),
+      this.preprocessedStateDetailsRepository.findByStateUpdateId(
+        stateUpdateId
+      ),
       this.preprocessedAssetHistoryRepository.getByStateUpdateIdPaginated(
         stateUpdateId,
         paginationOpts

diff --git a/packages/backend/src/core/preprocessing/Preprocessor.test.ts b/packages/backend/src/core/preprocessing/Preprocessor.test.ts
@@ -74,6 +74,7 @@ describe(Preprocessor.name, () => {
     it('catches up', async () => {
       const mockKnexTransaction = mockObject<Knex.Transaction>()
       const lastPreprocessedStateUpdateId = 10
+      const preprocessL2TransactionTo = 5
       const mockUserStatisticsPreprocessor =
         mockObject<UserStatisticsPreprocessor>({
           catchUp: mockFn().resolvesTo(undefined),
@@ -110,6 +111,12 @@ describe(Preprocessor.name, () => {
         true
       )
 
+      const mockGetStateUpdateIdToCatchUpL2TransactionsTo = mockFn().resolvesTo(
+        preprocessL2TransactionTo
+      )
+      preprocessor.getStateUpdateIdToCatchUpL2TransactionsTo =
+        mockGetStateUpdateIdToCatchUpL2TransactionsTo
+
       await preprocessor.catchUp()
 
       expect(
@@ -125,10 +132,10 @@ describe(Preprocessor.name, () => {
       )
       expect(
         mockStateDetailsPreprocessor.catchUpL2Transactions
-      ).toHaveBeenCalledWith(mockKnexTransaction, lastPreprocessedStateUpdateId)
-      expect(mockUserStatisticsPreprocessor.catchUp).toHaveBeenCalledWith(
+      ).toHaveBeenCalledWith(mockKnexTransaction, preprocessL2TransactionTo)
+      expect(mockUserL2TransactionsPreprocessor.catchUp).toHaveBeenCalledWith(
         mockKnexTransaction,
-        lastPreprocessedStateUpdateId
+        preprocessL2TransactionTo
       )
     })
 

diff --git a/packages/backend/src/core/preprocessing/Preprocessor.ts b/packages/backend/src/core/preprocessing/Preprocessor.ts
@@ -133,13 +133,19 @@ export class Preprocessor<T extends AssetHash | AssetId> {
         )
 
         if (this.l2TransactionsEnabled) {
+          const preprocessL2TransactionTo =
+            await this.getStateUpdateIdToCatchUpL2TransactionsTo(
+              trx,
+              lastProcessedStateUpdate.stateUpdateId
+            )
+
           await this.stateDetailsPreprocessor.catchUpL2Transactions(
             trx,
-            lastProcessedStateUpdate.stateUpdateId
+            preprocessL2TransactionTo
           )
           await this.userL2TransactionsPreprocessor.catchUp(
             trx,
-            lastProcessedStateUpdate.stateUpdateId
+            preprocessL2TransactionTo
           )
         }
       }