Merge pull request #50 from RiseVision/feature/merge-types-packages

Fixes #31: core-interfaces -> core-types
RiseVision · Mar 6, 2019 · 78bdd25 · 78bdd25
2 parents f2ec4f7 + 2a9b99d
commit 78bdd25
Show file tree

Hide file tree

Showing 267 changed files with 581 additions and 621 deletions.
diff --git a/.idea/rise-node.iml b/.idea/rise-node.iml
diff --git a/docker/files/Dockerfile b/docker/files/Dockerfile
@@ -28,7 +28,6 @@ COPY --chown=rise ./packages/core-consensus-dpos/package.json ./packages/core-co
 COPY --chown=rise ./packages/core-crypto/package.json ./packages/core-crypto/package.json
 COPY --chown=rise ./packages/core-exceptions/package.json ./packages/core-exceptions/package.json
 COPY --chown=rise ./packages/core-helpers/package.json ./packages/core-helpers/package.json
-COPY --chown=rise ./packages/core-interfaces/package.json ./packages/core-interfaces/package.json
 COPY --chown=rise ./packages/core-launchpad/package.json ./packages/core-launchpad/package.json
 COPY --chown=rise ./packages/core-models/package.json ./packages/core-models/package.json
 COPY --chown=rise ./packages/core-p2p/package.json ./packages/core-p2p/package.json

diff --git a/docker/files/Dockerfile.arm b/docker/files/Dockerfile.arm
@@ -30,7 +30,6 @@ COPY --chown=rise ./packages/core-consensus-dpos/package.json ./packages/core-co
 COPY --chown=rise ./packages/core-crypto/package.json ./packages/core-crypto/package.json
 COPY --chown=rise ./packages/core-exceptions/package.json ./packages/core-exceptions/package.json
 COPY --chown=rise ./packages/core-helpers/package.json ./packages/core-helpers/package.json
-COPY --chown=rise ./packages/core-interfaces/package.json ./packages/core-interfaces/package.json
 COPY --chown=rise ./packages/core-launchpad/package.json ./packages/core-launchpad/package.json
 COPY --chown=rise ./packages/core-models/package.json ./packages/core-models/package.json
 COPY --chown=rise ./packages/core-p2p/package.json ./packages/core-p2p/package.json

diff --git a/packages/core-accounts/package.json b/packages/core-accounts/package.json
@@ -17,7 +17,6 @@
     "@risevision/core": "^1.0.0",
     "@risevision/core-apis": "^1.0.0",
     "@risevision/core-helpers": "^1.0.0",
-    "@risevision/core-interfaces": "^1.0.0",
     "@risevision/core-launchpad": "^1.0.0",
     "@risevision/core-models": "^1.0.0",
     "@risevision/core-types": "^1.0.0",
@@ -49,4 +48,4 @@
     "ts-node": "7.0.1",
     "typescript": "3.2.2"
   }
-}
+}
diff --git a/packages/core-accounts/src/apis/accountsAPI.ts b/packages/core-accounts/src/apis/accountsAPI.ts
@@ -1,15 +1,13 @@
 import { CoreSymbols } from '@risevision/core';
 import { DeprecatedAPIError, HTTPError } from '@risevision/core-apis';
-import {
-  IAccountsModel,
-  IAccountsModule,
-  ISystemModule,
-} from '@risevision/core-interfaces';
 import { LaunchpadSymbols } from '@risevision/core-launchpad';
 import {
   AppConfig,
   ConstantsType,
   FieldsInModel,
+  IAccountsModel,
+  IAccountsModule,
+  ISystemModule,
 } from '@risevision/core-types';
 import {
   IoCSymbol,

diff --git a/packages/core-accounts/src/coremodule.ts b/packages/core-accounts/src/coremodule.ts
@@ -1,8 +1,7 @@
 import { APISymbols } from '@risevision/core-apis';
-import { Symbols } from '@risevision/core-interfaces';
 import { BaseCoreModule } from '@risevision/core-launchpad';
 import { ModelSymbols } from '@risevision/core-models';
-import { AppConfig, ConstantsType } from '@risevision/core-types';
+import { AppConfig, ConstantsType, Symbols } from '@risevision/core-types';
 import * as z_schema from 'z-schema';
 import { AccountsAPI } from './apis';
 import { AccountsLoaderSubscriber } from './hooks/';

diff --git a/packages/core-accounts/src/hooks/filters.ts b/packages/core-accounts/src/hooks/filters.ts
@@ -1,4 +1,4 @@
-import { IAccountsModel } from '@risevision/core-interfaces';
+import { IAccountsModel } from '@risevision/core-types';
 import { createFilterDecorator as createFilter } from '@risevision/core-utils';
 
 /**

diff --git a/packages/core-accounts/src/hooks/subscribers/loader.ts b/packages/core-accounts/src/hooks/subscribers/loader.ts
@@ -1,6 +1,6 @@
 import { OnCheckIntegrity, RecreateAccountsTables } from '@risevision/core';
-import { ILogger, Symbols } from '@risevision/core-interfaces';
 import { ModelSymbols } from '@risevision/core-models';
+import { ILogger, Symbols } from '@risevision/core-types';
 import { catchToLoggerAndRemapError } from '@risevision/core-utils';
 import * as fs from 'fs';
 import { decorate, inject, injectable, named } from 'inversify';

diff --git a/packages/core-accounts/src/logic/account.ts b/packages/core-accounts/src/logic/account.ts
@@ -1,16 +1,18 @@
 import { CoreSymbols } from '@risevision/core';
+import { LaunchpadSymbols } from '@risevision/core-launchpad';
+import { ModelSymbols } from '@risevision/core-models';
 import {
   AccountDiffType,
   AccountFilterData,
+  Address,
+  ConstantsType,
+  DBOp,
   IAccountLogic,
   IAccountsModel,
   IIdsHandler,
   ILogger,
   Symbols,
-} from '@risevision/core-interfaces';
-import { LaunchpadSymbols } from '@risevision/core-launchpad';
-import { ModelSymbols } from '@risevision/core-models';
-import { Address, ConstantsType, DBOp } from '@risevision/core-types';
+} from '@risevision/core-types';
 import { inject, injectable, named } from 'inversify';
 import * as sequelize from 'sequelize';
 import * as z_schema from 'z-schema';

diff --git a/packages/core-accounts/src/models/AccountsModel.ts b/packages/core-accounts/src/models/AccountsModel.ts
@@ -1,6 +1,5 @@
 // tslint:disable
-import { publicKey, Address } from '@risevision/core-types';
-import { IAccountsModel } from '@risevision/core-interfaces';
+import { Address, IAccountsModel, publicKey } from '@risevision/core-types';
 import * as pgp from 'pg-promise';
 import * as sequelize from 'sequelize';
 import { Op } from 'sequelize';

diff --git a/packages/core-accounts/src/modules/accounts.ts b/packages/core-accounts/src/modules/accounts.ts
@@ -1,13 +1,15 @@
+import { DBHelper, ModelSymbols } from '@risevision/core-models';
 import {
   AccountDiffType,
   AccountFilterData,
+  Address,
+  DBOp,
   IAccountsModel,
   IAccountsModule,
+  IBaseTransaction,
   IIdsHandler,
   Symbols,
-} from '@risevision/core-interfaces';
-import { DBHelper, ModelSymbols } from '@risevision/core-models';
-import { Address, DBOp, IBaseTransaction } from '@risevision/core-types';
+} from '@risevision/core-types';
 import { inject, injectable, named } from 'inversify';
 import { AccountLogic } from '../logic';
 import { AccountsSymbols } from '../symbols';

diff --git a/packages/core-accounts/src/symbols.ts b/packages/core-accounts/src/symbols.ts
@@ -1,4 +1,4 @@
-import { Symbols } from '@risevision/core-interfaces';
+import { Symbols } from '@risevision/core-types';
 
 export const AccountsSymbols = {
   api: Symbol.for('rise.accounts.api'),

diff --git a/packages/core-accounts/tests/unit/apis/accountsAPI.spec.ts b/packages/core-accounts/tests/unit/apis/accountsAPI.spec.ts
@@ -1,8 +1,12 @@
 import { APISymbols } from '@risevision/core-apis';
-import { IAccountsModel, Symbols } from '@risevision/core-interfaces';
 import { createContainer } from '@risevision/core-launchpad/tests/unit/utils/createContainer';
 import { ModelSymbols } from '@risevision/core-models';
-import { AppConfig, ConstantsType } from '@risevision/core-types';
+import {
+  AppConfig,
+  ConstantsType,
+  IAccountsModel,
+  Symbols,
+} from '@risevision/core-types';
 import * as chai from 'chai';
 import { expect } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

diff --git a/packages/core-accounts/tests/unit/logic/account.spec.ts b/packages/core-accounts/tests/unit/logic/account.spec.ts
@@ -1,8 +1,7 @@
 // tslint:disable object-literal-sort-keys no-big-function
-import { IAccountsModel } from '@risevision/core-interfaces';
 import { createContainer } from '@risevision/core-launchpad/tests/unit/utils/createContainer';
 import { ModelSymbols } from '@risevision/core-models';
-import { Address, DBUpdateOp } from '@risevision/core-types';
+import { Address, DBUpdateOp, IAccountsModel } from '@risevision/core-types';
 import * as chai from 'chai';
 import { expect } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

diff --git a/packages/core-accounts/tests/unit/modules/accounts.spec.ts b/packages/core-accounts/tests/unit/modules/accounts.spec.ts
@@ -1,7 +1,10 @@
-import { IAccountsModel, IAccountsModule } from '@risevision/core-interfaces';
 import { createContainer } from '@risevision/core-launchpad/tests/unit/utils/createContainer';
 import { ModelSymbols } from '@risevision/core-models';
-import { Address } from '@risevision/core-types';
+import {
+  Address,
+  IAccountsModel,
+  IAccountsModule,
+} from '@risevision/core-types';
 import * as chai from 'chai';
 import { expect } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

diff --git a/packages/core-apis/package.json b/packages/core-apis/package.json
@@ -15,7 +15,6 @@
   "author": "Rise Team, Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>, Shift Team",
   "license": "GPL-3.0",
   "dependencies": {
-    "@risevision/core-interfaces": "^1.0.0",
     "@risevision/core-helpers": "^1.0.0",
     "@risevision/core-launchpad": "^1.0.0",
     "@risevision/core-types": "^1.0.0",
@@ -51,4 +50,4 @@
     "ts-node": "7.0.1",
     "typescript": "3.2.2"
   }
-}
+}
diff --git a/packages/core-apis/src/coremodule.ts b/packages/core-apis/src/coremodule.ts
@@ -1,6 +1,5 @@
-import { Symbols } from '@risevision/core-interfaces';
 import { BaseCoreModule } from '@risevision/core-launchpad';
-import { AppConfig } from '@risevision/core-types';
+import { AppConfig, Symbols } from '@risevision/core-types';
 import { cbToPromise } from '@risevision/core-utils';
 import * as bodyParser from 'body-parser';
 import * as compression from 'compression';

diff --git a/packages/core-apis/src/helpers/middlewares.ts b/packages/core-apis/src/helpers/middlewares.ts
@@ -1,4 +1,4 @@
-import { ILogger } from '@risevision/core-interfaces';
+import { ILogger } from '@risevision/core-types';
 import { NextFunction, Request, Response } from 'express';
 
 export const middleware = {

diff --git a/packages/core-apis/src/socketio.ts b/packages/core-apis/src/socketio.ts
@@ -1,5 +1,8 @@
-import { Symbols } from '@risevision/core-interfaces';
-import { IBaseTransaction, SignedBlockType } from '@risevision/core-types';
+import {
+  IBaseTransaction,
+  SignedBlockType,
+  Symbols,
+} from '@risevision/core-types';
 import { decorate, inject, injectable } from 'inversify';
 import {
   OnWPAction,

diff --git a/packages/core-apis/src/utils/errorHandler.ts b/packages/core-apis/src/utils/errorHandler.ts
@@ -1,4 +1,4 @@
-import { ILogger, Symbols } from '@risevision/core-interfaces';
+import { ILogger, Symbols } from '@risevision/core-types';
 import { IoCSymbol } from '@risevision/core-utils';
 import express from 'express';
 import { inject, injectable } from 'inversify';

diff --git a/packages/core-apis/src/utils/privateApisGuard.ts b/packages/core-apis/src/utils/privateApisGuard.ts
@@ -1,4 +1,4 @@
-import { Symbols } from '@risevision/core-interfaces';
+import { Symbols } from '@risevision/core-types';
 import { checkIpInList, IoCSymbol } from '@risevision/core-utils';
 import * as express from 'express';
 import { inject, injectable } from 'inversify';

diff --git a/packages/core-apis/tests/unit/errorHandler.spec.ts b/packages/core-apis/tests/unit/errorHandler.spec.ts
@@ -1,7 +1,7 @@
 // tslint:disable object-literal-sort-keys
-import { Symbols } from '@risevision/core-interfaces';
 import { createContainer } from '@risevision/core-launchpad/tests/unit/utils/createContainer';
 import { p2pSymbols } from '@risevision/core-p2p';
+import { Symbols } from '@risevision/core-types';
 import { LoggerStub } from '@risevision/core-utils/tests/unit/stubs';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

diff --git a/packages/core-apis/tests/unit/forgingApisWatchGuard.spec.ts b/packages/core-apis/tests/unit/forgingApisWatchGuard.spec.ts
@@ -1,5 +1,5 @@
-import { Symbols } from '@risevision/core-interfaces';
 import { createContainer } from '@risevision/core-launchpad/tests/unit/utils/createContainer';
+import { Symbols } from '@risevision/core-types';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { Container } from 'inversify';

diff --git a/packages/core-blocks/package.json b/packages/core-blocks/package.json
@@ -18,7 +18,6 @@
     "@risevision/core-apis": "^1.0.0",
     "@risevision/core-crypto": "^1.0.0",
     "@risevision/core-helpers": "^1.0.0",
-    "@risevision/core-interfaces": "^1.0.0",
     "@risevision/core-launchpad": "^1.0.0",
     "@risevision/core-models": "^1.0.0",
     "@risevision/core-p2p": "^1.0.0",
@@ -57,4 +56,4 @@
     "ts-node": "7.0.1",
     "typescript": "3.2.2"
   }
-}
+}
diff --git a/packages/core-blocks/src/apis/blocksAPI.ts b/packages/core-blocks/src/apis/blocksAPI.ts
@@ -1,6 +1,9 @@
 import { DeprecatedAPIError, HTTPError } from '@risevision/core-apis';
 import { Sequence } from '@risevision/core-helpers';
+import { LaunchpadSymbols } from '@risevision/core-launchpad';
+import { ModelSymbols } from '@risevision/core-models';
 import {
+  ConstantsType,
   IBlockLogic,
   IBlockReward,
   IBlocksModel,
@@ -10,10 +13,7 @@ import {
   ITransactionLogic,
   ITransactionsModel,
   Symbols,
-} from '@risevision/core-interfaces';
-import { LaunchpadSymbols } from '@risevision/core-launchpad';
-import { ModelSymbols } from '@risevision/core-models';
-import { ConstantsType } from '@risevision/core-types';
+} from '@risevision/core-types';
 import {
   IoCSymbol,
   removeEmptyObjKeys,

diff --git a/packages/core-blocks/src/blocksSymbols.ts b/packages/core-blocks/src/blocksSymbols.ts
@@ -1,4 +1,4 @@
-import { Symbols } from '@risevision/core-interfaces';
+import { Symbols } from '@risevision/core-types';
 
 export const BlocksSymbols = {
   api: {

diff --git a/packages/core-blocks/src/coremodule.ts b/packages/core-blocks/src/coremodule.ts
@@ -1,9 +1,12 @@
 import { APISymbols } from '@risevision/core-apis';
-import { Symbols } from '@risevision/core-interfaces';
 import { BaseCoreModule } from '@risevision/core-launchpad';
 import { ModelSymbols } from '@risevision/core-models';
 import { p2pSymbols } from '@risevision/core-p2p';
-import { AppConfig, SignedAndChainedBlockType } from '@risevision/core-types';
+import {
+  AppConfig,
+  SignedAndChainedBlockType,
+  Symbols,
+} from '@risevision/core-types';
 import { BlocksAPI } from './apis/blocksAPI';
 import { BlocksConstantsType, constants } from './blocksConstants';
 import { BlocksSymbols } from './blocksSymbols';

diff --git a/packages/core-blocks/src/helpers/blockProgressLogger.ts b/packages/core-blocks/src/helpers/blockProgressLogger.ts
@@ -1,4 +1,4 @@
-import { ILogger } from '@risevision/core-interfaces';
+import { ILogger } from '@risevision/core-types';
 
 export class BlockProgressLogger {
   private target: number;

diff --git a/packages/core-blocks/src/hooks/actions.ts b/packages/core-blocks/src/hooks/actions.ts
@@ -1,7 +1,7 @@
 // ### Chain module hooks
-import { IBlocksModel } from '@risevision/core-interfaces';
 import {
   IBaseTransaction,
+  IBlocksModel,
   SignedAndChainedBlockType,
   SignedBlockType,
 } from '@risevision/core-types';

diff --git a/packages/core-blocks/src/hooks/subscribers/loader.ts b/packages/core-blocks/src/hooks/subscribers/loader.ts
@@ -1,14 +1,14 @@
+import { IPeersModule, p2pSymbols, Peer } from '@risevision/core-p2p';
 import {
   IAccountsModule,
   IAppState,
   IBlocksModule,
   ILogger,
   ISequence,
   ITimeToEpoch,
+  SignedAndChainedBlockType,
   Symbols,
-} from '@risevision/core-interfaces';
-import { IPeersModule, p2pSymbols, Peer } from '@risevision/core-p2p';
-import { SignedAndChainedBlockType } from '@risevision/core-types';
+} from '@risevision/core-types';
 import { WrapInDefaultSequence } from '@risevision/core-utils';
 import { decorate, inject, injectable, named } from 'inversify';
 import {

diff --git a/packages/core-blocks/src/logic/block.ts b/packages/core-blocks/src/logic/block.ts
@@ -1,22 +1,20 @@
+import { ModelSymbols } from '@risevision/core-models';
+import { p2pSymbols, ProtoBufHelper } from '@risevision/core-p2p';
 import {
+  BlockType,
+  DBOp,
   IAccountLogic,
+  IBaseTransaction,
   IBlockLogic,
   IBlocksModel,
   ICrypto,
   IIdsHandler,
+  IKeypair,
   ITransactionLogic,
   ITXBytes,
-  Symbols,
-} from '@risevision/core-interfaces';
-import { ModelSymbols } from '@risevision/core-models';
-import { p2pSymbols, ProtoBufHelper } from '@risevision/core-p2p';
-import {
-  BlockType,
-  DBOp,
-  IBaseTransaction,
-  IKeypair,
   SignedAndChainedBlockType,
   SignedBlockType,
+  Symbols,
 } from '@risevision/core-types';
 import * as crypto from 'crypto';
 import * as filterObject from 'filter-object';

diff --git a/packages/core-blocks/src/logic/blockBytes.ts b/packages/core-blocks/src/logic/blockBytes.ts
@@ -1,9 +1,11 @@
-import { IIdsHandler, ITXBytes, Symbols } from '@risevision/core-interfaces';
 import { p2pSymbols, ProtoBufHelper } from '@risevision/core-p2p';
 import {
   BlockHeader,
   ConstantsType,
+  IIdsHandler,
+  ITXBytes,
   SignedAndChainedBlockType,
+  Symbols,
 } from '@risevision/core-types';
 import { toBigIntLE, toBufferLE } from 'bigint-buffer';
 import * as ByteBuffer from 'bytebuffer';

diff --git a/packages/core-blocks/src/logic/blockReward.ts b/packages/core-blocks/src/logic/blockReward.ts
@@ -1,5 +1,8 @@
-import { IBlockReward, Symbols } from '@risevision/core-interfaces';
-import { SignedAndChainedBlockType } from '@risevision/core-types';
+import {
+  IBlockReward,
+  SignedAndChainedBlockType,
+  Symbols,
+} from '@risevision/core-types';
 import { inject, injectable, postConstruct } from 'inversify';
 import { BlocksConstantsType } from '../blocksConstants';
 import { BlocksSymbols } from '../blocksSymbols';