Remove saveBlockAndFetchEvents method callback pattern (#244)

* Remove saveBlockAndFetchEvents method callback pattern

* Accomodate change in code generator

Co-authored-by: prathamesh0 <prathamesh.musale0@gmail.com>
This commit is contained in:
2022-11-21 15:54:28 +04:00
committed by GitHub
co-authored by prathamesh
parent 1e639c1af3
commit 06e5c62fa8
9 changed files with 10 additions and 16 deletions
+2
View File
@@ -196,7 +196,9 @@ export const _fetchBatchBlocks = async (
block.blockTimestamp = block.timestamp;
try {
log(`_fetchBatchBlocks#saveBlockAndFetchEvents: fetching from upstream server ${block.blockHash}`);
const [blockProgress, events] = await indexer.saveBlockAndFetchEvents(block);
log(`_fetchBatchBlocks#saveBlockAndFetchEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
return { blockProgress, events };
} catch (error) {
log(error);
-10
View File
@@ -263,16 +263,6 @@ export class Indexer {
return this._db.getEvent(id);
}
async saveBlockAndFetchEvents (block: DeepPartial<BlockProgressInterface>, saveBlockAndFetchEvents: (block: DeepPartial<BlockProgressInterface>) => Promise<[BlockProgressInterface, DeepPartial<EventInterface>[]]>): Promise<[BlockProgressInterface, DeepPartial<EventInterface>[]]> {
assert(block.blockHash);
log(`getBlockEvents: fetching from upstream server ${block.blockHash}`);
const [blockProgress, events] = await saveBlockAndFetchEvents(block);
log(`getBlockEvents: fetched for block: ${blockProgress.blockHash} num events: ${blockProgress.numEvents}`);
return [blockProgress, events];
}
async fetchEvents (blockHash: string, blockNumber: number, parseEventNameAndArgs: (kind: string, logObj: any) => any): Promise<DeepPartial<EventInterface>[]> {
let logsPromise: Promise<any>;
+2
View File
@@ -362,7 +362,9 @@ export class JobRunner {
await wait(jobDelayInMilliSecs);
console.time('time:job-runner#_indexBlock-saveBlockAndFetchEvents');
log(`_indexBlock#saveBlockAndFetchEvents: fetching from upstream server ${blockHash}`);
[blockProgress] = 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: [] });