Update tests

subquery · Sep 29, 2024 · 01a2f8c · 01a2f8c
1 parent c9db561
commit 01a2f8c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/packages/node-core/src/indexer/fetch.service.spec.ts b/packages/node-core/src/indexer/fetch.service.spec.ts
@@ -3,7 +3,7 @@
 
 import {EventEmitter2} from '@nestjs/event-emitter';
 import {SchedulerRegistry} from '@nestjs/schedule';
-import {BaseDataSource, BaseHandler, BaseMapping, DictionaryQueryEntry, IProjectNetworkConfig} from '@subql/types-core';
+import {BaseDataSource, BaseHandler, BaseMapping, DictionaryQueryEntry} from '@subql/types-core';
 import {range} from 'lodash';
 import {
   BaseUnfinalizedBlocksService,
@@ -83,11 +83,6 @@ const nodeConfig = new NodeConfig({
   networkDictionary: [''],
 });
 
-const getNetworkConfig = () =>
-  ({
-    dictionary: 'https://example.com',
-  }) as IProjectNetworkConfig;
-
 const mockDs: BaseDataSource = {
   kind: 'mock/DataSource',
   startBlock: 1,
@@ -140,7 +135,7 @@ const getDictionaryService = () =>
     initDictionaries: () => {
       /* TODO */
     },
-  }) as any as DictionaryService<any, any>;
+  } as any as DictionaryService<any, any>);
 
 const getBlockDispatcher = () => {
   const inst = {
@@ -164,9 +159,9 @@ describe('Fetch Service', () => {
   let fetchService: TestFetchService;
   let blockDispatcher: IBlockDispatcher<any>;
   let dictionaryService: DictionaryService<any, any>;
-  let networkConfig: IProjectNetworkConfig;
   let dataSources: BaseDataSource[];
   let unfinalizedBlocksService: BaseUnfinalizedBlocksService<any>;
+  let projectService: IProjectService<any>;
 
   let spyOnEnqueueSequential: jest.SpyInstance<
     void | Promise<void>,
@@ -183,7 +178,7 @@ describe('Fetch Service', () => {
     const eventEmitter = new EventEmitter2();
     const schedulerRegistry = new SchedulerRegistry();
 
-    const projectService = {
+    projectService = {
       getStartBlockFromDataSources: jest.fn(() => Math.min(...dataSources.map((ds) => ds.startBlock ?? 0))),
       getAllDataSources: jest.fn(() => dataSources),
       getDataSourcesMap: jest.fn(() => {
@@ -197,16 +192,15 @@ describe('Fetch Service', () => {
         });
         return new BlockHeightMap(x);
       }),
+      bypassBlocks: [],
     } as any as IProjectService<any>;
 
     blockDispatcher = getBlockDispatcher();
     dictionaryService = getDictionaryService();
-    networkConfig = getNetworkConfig();
 
     fetchService = new TestFetchService(
       nodeConfig,
       projectService,
-      networkConfig,
       blockDispatcher,
       dictionaryService,
       eventEmitter,
@@ -331,7 +325,8 @@ describe('Fetch Service', () => {
     );
 
     await fetchService.init(1);
-    expect((fetchService as any).bypassBlocks).toEqual(range(301, 500));
+
+    expect((fetchService as any).getDatasourceBypassBlocks()).toEqual([`301-500`]);
   });
 
   it('checks chain heads at an interval', async () => {
@@ -614,7 +609,7 @@ describe('Fetch Service', () => {
   });
 
   it('skips bypassBlocks', async () => {
-    (fetchService as any).networkConfig.bypassBlocks = [3];
+    projectService.bypassBlocks = [3];
 
     await fetchService.init(1);
 
@@ -625,7 +620,7 @@ describe('Fetch Service', () => {
 
   it('transforms bypassBlocks', async () => {
     // Set a range so on init its transformed
-    (fetchService as any).networkConfig.bypassBlocks = ['2-5'];
+    projectService.bypassBlocks = ['2-5'];
 
     await fetchService.init(1);
 

diff --git a/packages/node-core/src/indexer/fetch.service.ts b/packages/node-core/src/indexer/fetch.service.ts
@@ -5,7 +5,7 @@ import assert from 'assert';
 import {OnApplicationShutdown} from '@nestjs/common';
 import {EventEmitter2} from '@nestjs/event-emitter';
 import {SchedulerRegistry} from '@nestjs/schedule';
-import {BaseDataSource, IProjectNetworkConfig} from '@subql/types-core';
+import {BaseDataSource} from '@subql/types-core';
 import {range} from 'lodash';
 import {NodeConfig} from '../configure';
 import {IndexerEvent} from '../events';
@@ -27,7 +27,6 @@ export abstract class BaseFetchService<DS extends BaseDataSource, B extends IBlo
   private _latestBestHeight?: number;
   private _latestFinalizedHeight?: number;
   private isShutdown = false;
-  // private bypassBlocks: number[] = [];
 
   // If the chain doesn't have a distinction between the 2 it should return the same value for finalized and best
   protected abstract getFinalizedHeader(): Promise<Header>;
@@ -47,7 +46,6 @@ export abstract class BaseFetchService<DS extends BaseDataSource, B extends IBlo
   constructor(
     private nodeConfig: NodeConfig,
     protected projectService: IProjectService<DS>,
-    protected networkConfig: IProjectNetworkConfig,
     protected blockDispatcher: B,
     protected dictionaryService: DictionaryService<DS, FB>,
     private eventEmitter: EventEmitter2,

diff --git a/packages/node/src/indexer/fetch.service.spec.ts b/packages/node/src/indexer/fetch.service.spec.ts
@@ -63,7 +63,6 @@ describe('FetchSevice', () => {
       null as any, // ApiService
       null as any, // NodeConfig
       projectService, // ProjectService
-      {} as any, // Project
       null as any, // BlockDispatcher,
       null as any, // DictionaryService
       null as any, // UnfinalizedBlocks

diff --git a/packages/node/src/indexer/fetch.service.test.ts b/packages/node/src/indexer/fetch.service.test.ts
@@ -26,7 +26,6 @@ describe('FetchService', () => {
       apiService, // ApiService
       null as any, // NodeConfig
       null as any, // ProjectService
-      {} as any, // Project
       null as any, // BlockDispatcher,
       null as any, // DictionaryService
       {

diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts
@@ -15,7 +15,6 @@ import {
   StoreCacheService,
 } from '@subql/node-core';
 import { SubstrateDatasource, SubstrateBlock } from '@subql/types';
-import { SubqueryProject } from '../configure/SubqueryProject';
 import { calcInterval, substrateHeaderToHeader } from '../utils/substrate';
 import { ApiService } from './api.service';
 import { ISubstrateBlockDispatcher } from './blockDispatcher/substrate-block-dispatcher';
@@ -37,7 +36,6 @@ export class FetchService extends BaseFetchService<
     private apiService: ApiService,
     nodeConfig: NodeConfig,
     @Inject('IProjectService') projectService: ProjectService,
-    @Inject('ISubqueryProject') project: SubqueryProject,
     @Inject('IBlockDispatcher')
     blockDispatcher: ISubstrateBlockDispatcher,
     dictionaryService: SubstrateDictionaryService,
@@ -50,7 +48,6 @@ export class FetchService extends BaseFetchService<
     super(
       nodeConfig,
       projectService,
-      project.network,
       blockDispatcher,
       dictionaryService,
       eventEmitter,