Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
yoozo committed Mar 3, 2025
1 parent 3a1bd7c commit be995ac
Showing 1 changed file with 38 additions and 33 deletions.
71 changes: 38 additions & 33 deletions packages/node-core/src/indexer/fetch.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright 2020-2025 SubQuery Pte Ltd authors & contributors
// SPDX-License-Identifier: GPL-3.0

import { EventEmitter2 } from '@nestjs/event-emitter';
import { SchedulerRegistry } from '@nestjs/schedule';
import { BaseCustomDataSource, BaseDataSource, BaseHandler, BaseMapping, DictionaryQueryEntry } from '@subql/types-core';
import {EventEmitter2} from '@nestjs/event-emitter';
import {SchedulerRegistry} from '@nestjs/schedule';
import {BaseCustomDataSource, BaseDataSource, BaseHandler, BaseMapping, DictionaryQueryEntry} from '@subql/types-core';
import {
UnfinalizedBlocksService,
BlockDispatcher,
Expand All @@ -19,9 +19,9 @@ import {
IBaseIndexerWorker,
BypassBlocks,
} from '../';
import { BlockHeightMap } from '../utils/blockHeightMap';
import { DictionaryService } from './dictionary/dictionary.service';
import { FetchService } from './fetch.service';
import {BlockHeightMap} from '../utils/blockHeightMap';
import {DictionaryService} from './dictionary/dictionary.service';
import {FetchService} from './fetch.service';

const CHAIN_INTERVAL = 100; // 100ms

Expand Down Expand Up @@ -73,7 +73,7 @@ class TestBlockchainService implements IBlockchainService {
fetchBlockWorker(
worker: IBaseIndexerWorker,
blockNum: number,
context: { workers: IBaseIndexerWorker[] }
context: {workers: IBaseIndexerWorker[]}
): Promise<Header> {
throw new Error('Method not implemented.');
}
Expand All @@ -82,7 +82,7 @@ class TestBlockchainService implements IBlockchainService {
blockHeight: this.finalizedHeight,
blockHash: '0xxx',
parentHash: '0xxx',
timestamp: new Date()
timestamp: new Date(),
});
}
async getBestHeight(): Promise<number> {
Expand Down Expand Up @@ -124,9 +124,13 @@ class TestBlockchainService implements IBlockchainService {
throw new Error('Method not implemented.');
}
// eslint-disable-next-line @typescript-eslint/promise-function-async
getBlockTimestamp(height: number): Promise<Date | undefined> {
getBlockTimestamp(height: number): Promise<Date> {
throw new Error('Method not implemented.');
}

async getRequiredHeaderForHeight(height: number): Promise<Header & {timestamp: Date}> {
return (await this.getHeaderForHeight(height)) as any;
}
}

const nodeConfig = new NodeConfig({
Expand Down Expand Up @@ -161,7 +165,7 @@ function mockModuloDs(startBlock: number, endBlock: number, modulo: number): Bas
{
kind: 'mock/Handler',
handler: 'mockFunction',
filter: { modulo: modulo },
filter: {modulo: modulo},
},
],
},
Expand Down Expand Up @@ -268,7 +272,8 @@ describe('Fetch Service', () => {
set: jest.fn(),
},
} as any,
blockchainService
blockchainService,
{} as any
);

spyOnEnqueueSequential = jest.spyOn(fetchService as any, 'enqueueSequential') as any;
Expand Down Expand Up @@ -302,20 +307,20 @@ describe('Fetch Service', () => {

const moduloBlockHeightMap = new BlockHeightMap(
new Map([
[1, [{ ...mockModuloDs(1, 100, 20), startBlock: 1, endBlock: 100 }]],
[1, [{...mockModuloDs(1, 100, 20), startBlock: 1, endBlock: 100}]],
[
101, // empty gap for discontinuous block
[],
],
[201, [{ ...mockModuloDs(201, 500, 30), startBlock: 201, endBlock: 500 }]],
[201, [{...mockModuloDs(201, 500, 30), startBlock: 201, endBlock: 500}]],
// to infinite
[500, [{ ...mockModuloDs(500, Number.MAX_SAFE_INTEGER, 99), startBlock: 500 }]],
[500, [{...mockModuloDs(500, Number.MAX_SAFE_INTEGER, 99), startBlock: 500}]],
// multiple ds
[
600,
[
{ ...mockModuloDs(500, 800, 99), startBlock: 600, endBlock: 800 },
{ ...mockModuloDs(700, Number.MAX_SAFE_INTEGER, 101), startBlock: 700 },
{...mockModuloDs(500, 800, 99), startBlock: 600, endBlock: 800},
{...mockModuloDs(700, Number.MAX_SAFE_INTEGER, 101), startBlock: 700},
],
],
])
Expand All @@ -333,43 +338,43 @@ describe('Fetch Service', () => {
[
1,
[
{ ...mockDs, startBlock: 1, endBlock: 300 },
{ ...mockDs, startBlock: 1, endBlock: 100 },
{...mockDs, startBlock: 1, endBlock: 300},
{...mockDs, startBlock: 1, endBlock: 100},
],
],
[
10,
[
{ ...mockDs, startBlock: 1, endBlock: 300 },
{ ...mockDs, startBlock: 1, endBlock: 100 },
{ ...mockDs, startBlock: 10, endBlock: 20 },
{...mockDs, startBlock: 1, endBlock: 300},
{...mockDs, startBlock: 1, endBlock: 100},
{...mockDs, startBlock: 10, endBlock: 20},
],
],
[
21,
[
{ ...mockDs, startBlock: 1, endBlock: 300 },
{ ...mockDs, startBlock: 1, endBlock: 100 },
{...mockDs, startBlock: 1, endBlock: 300},
{...mockDs, startBlock: 1, endBlock: 100},
],
],
[
50,
[
{ ...mockDs, startBlock: 1, endBlock: 300 },
{ ...mockDs, startBlock: 1, endBlock: 100 },
{ ...mockDs, startBlock: 50, endBlock: 200 },
{...mockDs, startBlock: 1, endBlock: 300},
{...mockDs, startBlock: 1, endBlock: 100},
{...mockDs, startBlock: 50, endBlock: 200},
],
],
[
101,
[
{ ...mockDs, startBlock: 1, endBlock: 300 },
{ ...mockDs, startBlock: 50, endBlock: 200 },
{...mockDs, startBlock: 1, endBlock: 300},
{...mockDs, startBlock: 50, endBlock: 200},
],
],
[201, [{ ...mockDs, startBlock: 1, endBlock: 300 }]],
[201, [{...mockDs, startBlock: 1, endBlock: 300}]],
[301, []],
[500, [{ ...mockDs, startBlock: 500 }]],
[500, [{...mockDs, startBlock: 500}]],
])
)
);
Expand Down Expand Up @@ -505,7 +510,7 @@ describe('Fetch Service', () => {
{
kind: 'mock/BlockHandler',
handler: 'mockFunction',
filter: { modulo: 3 },
filter: {modulo: 3},
},
{
kind: 'mock/CallHandler',
Expand Down Expand Up @@ -638,7 +643,7 @@ describe('Fetch Service', () => {

it('enqueues modulo blocks with furture dataSources', async () => {
fetchService.mockGetModulos([3]);
dataSources.push({ ...mockDs, startBlock: 20 });
dataSources.push({...mockDs, startBlock: 20});

await fetchService.init(1);

Expand All @@ -651,7 +656,7 @@ describe('Fetch Service', () => {
it('at the end of modulo block filter, enqueue END should be min of data source range end height and api last height', async () => {
// So this will skip next data source
fetchService.mockGetModulos([10]);
dataSources.push({ ...mockDs, startBlock: 200 });
dataSources.push({...mockDs, startBlock: 200});
await fetchService.init(191);

expect((fetchService as any).useDictionary).toBeFalsy();
Expand Down

0 comments on commit be995ac

Please # to comment.