fix node-core import in node (#1272)

subquery · Aug 28, 2022 · 5b1e578 · 5b1e578
1 parent 6ad1dc3
commit 5b1e578
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 54 deletions.
diff --git a/packages/node/src/app.module.ts b/packages/node/src/app.module.ts
@@ -4,7 +4,7 @@
 import { Module } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
-import { DbModule } from '@subql/node-core/db';
+import { DbModule } from '@subql/node-core';
 import { ConfigureModule } from './configure/configure.module';
 import { FetchModule } from './indexer/fetch.module';
 import { MetaModule } from './meta/meta.module';

diff --git a/packages/node/src/configure/configure.module.ts b/packages/node/src/configure/configure.module.ts
@@ -6,8 +6,14 @@ import path from 'path';
 import { DynamicModule, Global, Module } from '@nestjs/common';
 import { getProjectRootAndManifest, IPFS_REGEX } from '@subql/common';
 import { SubstrateProjectNetworkConfig } from '@subql/common-substrate';
-import { getYargsOption, getLogger, setLevel } from '@subql/node-core';
-import { IConfig, MinConfig, NodeConfig } from '@subql/node-core/configure';
+import {
+  IConfig,
+  MinConfig,
+  NodeConfig,
+  getYargsOption,
+  getLogger,
+  setLevel,
+} from '@subql/node-core';
 import { camelCase, last, omitBy, isNil } from 'lodash';
 import { SubqueryProject } from './SubqueryProject';
 const logger = getLogger('configure');

diff --git a/packages/node/src/indexer/api.service.test.ts b/packages/node/src/indexer/api.service.test.ts
@@ -5,7 +5,7 @@ import { INestApplication } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { Test } from '@nestjs/testing';
 import { BlockHash, RuntimeVersion } from '@polkadot/types/interfaces';
-import { delay } from '@subql/node-core/utils';
+import { delay } from '@subql/node-core';
 import { SubstrateBlock } from '@subql/types';
 import { GraphQLSchema } from 'graphql';
 import { SubqueryProject } from '../configure/SubqueryProject';

diff --git a/packages/node/src/indexer/api.service.ts b/packages/node/src/indexer/api.service.ts
@@ -7,8 +7,11 @@ import { ApiPromise, WsProvider } from '@polkadot/api';
 import { ApiOptions, RpcMethodResult } from '@polkadot/api/types';
 import { RuntimeVersion } from '@polkadot/types/interfaces';
 import { AnyFunction, DefinitionRpcExt } from '@polkadot/types/types';
-import { getLogger } from '@subql/node-core';
-import { IndexerEvent, NetworkMetadataPayload } from '@subql/node-core/events';
+import {
+  IndexerEvent,
+  NetworkMetadataPayload,
+  getLogger,
+} from '@subql/node-core';
 import { SubstrateBlock } from '@subql/types';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiAt } from './types';

diff --git a/packages/node/src/indexer/dynamic-ds.service.ts b/packages/node/src/indexer/dynamic-ds.service.ts
@@ -4,8 +4,7 @@
 import assert from 'assert';
 import { Injectable } from '@nestjs/common';
 import { isCustomDs, isRuntimeDs } from '@subql/common-substrate';
-import { getLogger } from '@subql/node-core';
-import { MetadataRepo } from '@subql/node-core/indexer/entities';
+import { getLogger, MetadataRepo } from '@subql/node-core';
 import { Transaction } from 'sequelize/types';
 import { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';

diff --git a/packages/node/src/indexer/fetch.module.ts b/packages/node/src/indexer/fetch.module.ts
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Module } from '@nestjs/common';
-import { DbModule } from '@subql/node-core/db';
 import {
   BenchmarkService,
   MmrService,
   StoreService,
   PoiService,
-} from '@subql/node-core/indexer';
-import { getYargsOption } from '@subql/node-core/yargs';
+  getYargsOption,
+  DbModule,
+} from '@subql/node-core';
 import { ApiService } from './api.service';
 import { DictionaryService } from './dictionary.service';
 import { DsProcessorService } from './ds-processor.service';

diff --git a/packages/node/src/indexer/fetch.service.spec.ts b/packages/node/src/indexer/fetch.service.spec.ts
@@ -10,8 +10,7 @@ import {
   SubstrateDatasourceKind,
   SubstrateHandlerKind,
 } from '@subql/common-substrate';
-import { NodeConfig } from '@subql/node-core/configure';
-import { IndexerEvent } from '@subql/node-core/events';
+import { IndexerEvent, NodeConfig } from '@subql/node-core';
 import { GraphQLSchema } from 'graphql';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { calcInterval, fetchBlocksBatches } from '../utils/substrate';

diff --git a/packages/node/src/indexer/fetch.service.test.ts b/packages/node/src/indexer/fetch.service.test.ts
@@ -12,7 +12,7 @@ import {
   SubstrateDatasourceKind,
   SubstrateHandlerKind,
 } from '@subql/common-substrate';
-import { NodeConfig } from '@subql/node-core/configure';
+import { NodeConfig } from '@subql/node-core';
 import { GraphQLSchema } from 'graphql';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import * as SubstrateUtil from '../utils/substrate';

diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts
@@ -21,10 +21,15 @@ import {
   SubstrateRuntimeHandlerFilter,
   SubstrateBlockFilter,
 } from '@subql/common-substrate';
-import { getYargsOption, getLogger, profiler } from '@subql/node-core';
-import { NodeConfig } from '@subql/node-core/configure';
-import { IndexerEvent } from '@subql/node-core/events';
-import { delay, checkMemoryUsage } from '@subql/node-core/utils';
+import {
+  delay,
+  checkMemoryUsage,
+  NodeConfig,
+  IndexerEvent,
+  getYargsOption,
+  getLogger,
+  profiler,
+} from '@subql/node-core';
 import {
   DictionaryQueryEntry,
   SubstrateBlock,

diff --git a/packages/node/src/indexer/indexer.manager.spec.ts b/packages/node/src/indexer/indexer.manager.spec.ts
@@ -6,9 +6,13 @@ import {
   SubstrateDatasourceKind,
   SubstrateHandlerKind,
 } from '@subql/common-substrate';
-import { NodeConfig } from '@subql/node-core/configure';
-import { SubqueryFactory } from '@subql/node-core/entities';
-import { StoreService, PoiService, MmrService } from '@subql/node-core/indexer';
+import {
+  StoreService,
+  PoiService,
+  MmrService,
+  SubqueryFactory,
+  NodeConfig,
+} from '@subql/node-core';
 import { GraphQLSchema } from 'graphql';
 import { Sequelize } from 'sequelize';
 import { SubqueryProject } from '../configure/SubqueryProject';

diff --git a/packages/node/src/indexer/indexer.manager.ts b/packages/node/src/indexer/indexer.manager.ts
@@ -18,14 +18,16 @@ import {
   SubstrateRuntimeHandlerInputMap,
 } from '@subql/common-substrate';
 import {
+  PoiBlock,
+  StoreService,
+  PoiService,
+  SubqueryRepo,
+  NodeConfig,
   getYargsOption,
   getLogger,
   profiler,
   profilerWrap,
 } from '@subql/node-core';
-import { NodeConfig } from '@subql/node-core/configure';
-import { SubqueryRepo } from '@subql/node-core/entities';
-import { PoiBlock, StoreService, PoiService } from '@subql/node-core/indexer';
 import {
   SubstrateBlock,
   SubstrateEvent,

diff --git a/packages/node/src/indexer/indexer.module.ts b/packages/node/src/indexer/indexer.module.ts
@@ -3,13 +3,12 @@
 
 import { Module } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { DbModule } from '@subql/node-core/db';
 import {
-  BenchmarkService,
+  DbModule,
   StoreService,
   PoiService,
   MmrService,
-} from '@subql/node-core/indexer';
+} from '@subql/node-core';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiService } from './api.service';
 import { DictionaryService } from './dictionary.service';

diff --git a/packages/node/src/indexer/project.service.test.ts b/packages/node/src/indexer/project.service.test.ts
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Test } from '@nestjs/testing';
-import { NodeConfig } from '@subql/node-core/configure';
-import { DbModule } from '@subql/node-core/db';
-import { SubqueryRepo } from '@subql/node-core/entities';
+import { SubqueryRepo, DbModule, NodeConfig } from '@subql/node-core';
 import { GraphQLSchema } from 'graphql';
 import { Sequelize } from 'sequelize';
 import { SubqueryProject } from '../configure/SubqueryProject';

diff --git a/packages/node/src/indexer/project.service.ts b/packages/node/src/indexer/project.service.ts
@@ -6,15 +6,18 @@ import fs from 'fs';
 import { isMainThread } from 'worker_threads';
 import { Inject, Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { getYargsOption, getLogger } from '@subql/node-core';
-import { NodeConfig } from '@subql/node-core/configure';
-import { SubqueryRepo } from '@subql/node-core/entities';
-import { IndexerEvent } from '@subql/node-core/events';
-import { StoreService, PoiService, MmrService } from '@subql/node-core/indexer';
 import {
   MetadataFactory,
   MetadataRepo,
-} from '@subql/node-core/indexer/entities';
+  SubqueryRepo,
+  NodeConfig,
+  IndexerEvent,
+  StoreService,
+  PoiService,
+  MmrService,
+  getYargsOption,
+  getLogger,
+} from '@subql/node-core';
 import { getAllEntitiesRelations } from '@subql/utils';
 import { QueryTypes, Sequelize } from 'sequelize';
 import { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';

diff --git a/packages/node/src/indexer/sandbox.service.spec.ts b/packages/node/src/indexer/sandbox.service.spec.ts
@@ -3,7 +3,7 @@
 
 import fs from 'fs';
 import * as path from 'path';
-import { NodeConfig } from '@subql/node-core/configure';
+import { NodeConfig } from '@subql/node-core';
 import { IndexerSandbox } from './sandbox.service';
 
 describe('sandbox for subql-node', () => {

diff --git a/packages/node/src/indexer/sandbox.service.ts b/packages/node/src/indexer/sandbox.service.ts
@@ -7,10 +7,13 @@ import {
   isDatasourceV0_2_0,
   SubstrateDataSource,
 } from '@subql/common-substrate';
-import { getYargsOption, getLogger } from '@subql/node-core';
-import { NodeConfig } from '@subql/node-core/configure';
-import { StoreService } from '@subql/node-core/indexer';
-import { timeout } from '@subql/node-core/utils';
+import {
+  timeout,
+  NodeConfig,
+  StoreService,
+  getYargsOption,
+  getLogger,
+} from '@subql/node-core';
 import { Store } from '@subql/types';
 import { levelFilter } from '@subql/utils';
 import { merge } from 'lodash';

diff --git a/packages/node/src/indexer/worker/block-dispatcher.service.ts b/packages/node/src/indexer/worker/block-dispatcher.service.ts
@@ -8,11 +8,15 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Interval } from '@nestjs/schedule';
 import { RuntimeVersion } from '@polkadot/types/interfaces';
 import { hexToU8a, u8aEq } from '@polkadot/util';
-import { delay, getYargsOption, profilerWrap } from '@subql/node-core';
-import { NodeConfig } from '@subql/node-core/configure';
-import { IndexerEvent } from '@subql/node-core/events';
-import { Worker } from '@subql/node-core/indexer';
-import { getLogger } from '@subql/node-core/logger';
+import {
+  getLogger,
+  NodeConfig,
+  IndexerEvent,
+  Worker,
+  delay,
+  getYargsOption,
+  profilerWrap,
+} from '@subql/node-core';
 import { SubstrateBlock } from '@subql/types';
 import chalk from 'chalk';
 import { last } from 'lodash';

diff --git a/packages/node/src/indexer/worker/worker.module.ts b/packages/node/src/indexer/worker/worker.module.ts
@@ -4,7 +4,7 @@
 import { Module } from '@nestjs/common';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
-import { DbModule } from '@subql/node-core/db';
+import { DbModule } from '@subql/node-core';
 import { ConfigureModule } from '../../configure/configure.module';
 import { IndexerModule } from '../indexer.module';
 

diff --git a/packages/node/src/indexer/worker/worker.service.ts b/packages/node/src/indexer/worker/worker.service.ts
@@ -4,8 +4,7 @@
 import { threadId } from 'node:worker_threads';
 import { Injectable } from '@nestjs/common';
 import { RuntimeVersion } from '@polkadot/types/interfaces';
-import { NodeConfig } from '@subql/node-core/configure';
-import { getLogger } from '@subql/node-core/logger';
+import { NodeConfig, getLogger } from '@subql/node-core';
 import { AutoQueue } from '../../utils/autoQueue';
 import { fetchBlocksBatches } from '../../utils/substrate';
 import { ApiService } from '../api.service';

diff --git a/packages/node/src/indexer/worker/worker.ts b/packages/node/src/indexer/worker/worker.ts
@@ -5,8 +5,7 @@ import assert from 'assert';
 import { threadId } from 'node:worker_threads';
 import { INestApplication } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { registerWorker } from '@subql/node-core/indexer';
-import { getLogger, NestLogger } from '@subql/node-core/logger';
+import { registerWorker, getLogger, NestLogger } from '@subql/node-core';
 import { IndexerManager } from '../indexer.manager';
 import { WorkerModule } from './worker.module';
 import {

diff --git a/packages/node/src/meta/meta.module.ts b/packages/node/src/meta/meta.module.ts
@@ -9,7 +9,7 @@ import {
   HealthController,
   HealthService,
   MmrQueryController,
-} from '@subql/node-core/meta';
+} from '@subql/node-core';
 import {
   makeGaugeProvider,
   PrometheusModule,

diff --git a/packages/node/src/meta/meta.service.ts b/packages/node/src/meta/meta.service.ts
@@ -12,8 +12,8 @@ import {
   ProcessBlockPayload,
   ProcessedBlockCountPayload,
   TargetBlockPayload,
-} from '@subql/node-core/events';
-import { StoreService } from '@subql/node-core/indexer';
+  StoreService,
+} from '@subql/node-core';
 
 const UPDATE_HEIGHT_INTERVAL = 60000;