Remove saveBlockAndFetchEvents method callback pattern

vulcanize · Nov 21, 2022 · 21e6d93 · 21e6d93
1 parent c1a26ee
commit 21e6d93
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/erc20-watcher/src/indexer.ts b/packages/erc20-watcher/src/indexer.ts
@@ -481,7 +481,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async saveBlockProgress (block: DeepPartial<BlockProgress>): Promise<BlockProgress> {

diff --git a/packages/uni-info-watcher/src/indexer.ts b/packages/uni-info-watcher/src/indexer.ts
@@ -547,7 +547,7 @@ export class Indexer implements IndexerInterface {
   }
 
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async saveBlockProgress (block: DeepPartial<BlockProgress>): Promise<BlockProgress> {

diff --git a/packages/uni-watcher/src/indexer.ts b/packages/uni-watcher/src/indexer.ts
@@ -488,7 +488,7 @@ export class Indexer implements IndexerInterface {
 
   // Note: Some event names might be unknown at this point, as earlier events might not yet be processed.
   async saveBlockAndFetchEvents (block: DeepPartial<BlockProgress>): Promise<[BlockProgress, DeepPartial<Event>[]]> {
-    return this._baseIndexer.saveBlockAndFetchEvents(block, this._saveBlockAndFetchEvents.bind(this));
+    return this._saveBlockAndFetchEvents(block);
   }
 
   async saveBlockProgress (block: DeepPartial<BlockProgress>): Promise<BlockProgress> {

diff --git a/packages/util/src/job-runner.ts b/packages/util/src/job-runner.ts
@@ -274,7 +274,9 @@ export class JobRunner {
         let events = [];
 
         console.time('time:job-runner#_indexBlock-saveBlockAndFetchEvents');
+        log(`_indexBlock#saveBlockAndFetchEvents: fetching from upstream server ${blockHash}`);
         [blockProgress, events] = await this._indexer.saveBlockAndFetchEvents({ cid, blockHash, blockNumber, parentHash, blockTimestamp });
+        log(`_indexBlock#saveBlockAndFetchEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
         console.timeEnd('time:job-runner#_indexBlock-saveBlockAndFetchEvents');
 
         this._blockAndEventsMap.set(blockHash, { block: blockProgress, events });