refactor(core-api): move PluginRegistry to core package

Resolves hyperledger-cacti#380 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz · Dec 14, 2020 · 33b33fd · 33b33fd
1 parent 0ce6208
commit 33b33fd
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 30 deletions.
diff --git a/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts b/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts
@@ -6,7 +6,7 @@ import {
   LogLevelDesc,
   LoggerProvider,
 } from "@hyperledger/cactus-common";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 import { PluginLedgerConnectorBesu } from "@hyperledger/cactus-plugin-ledger-connector-besu";
 import {
   PluginLedgerConnectorQuorum,

diff --git a/examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app.ts b/examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app.ts
@@ -10,9 +10,10 @@ import {
   Consortium,
   ConsortiumMember,
   LedgerType,
-  PluginRegistry,
 } from "@hyperledger/cactus-core-api";
 
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   LogLevelDesc,
   Logger,

diff --git a/packages/cactus-cmd-api-server/package.json b/packages/cactus-cmd-api-server/package.json
@@ -64,6 +64,7 @@
   "dependencies": {
     "@hyperledger/cactus-cockpit": "^0.2.0",
     "@hyperledger/cactus-common": "^0.2.0",
+    "@hyperledger/cactus-core": "^0.2.0",
     "@hyperledger/cactus-core-api": "^0.2.0",
     "@hyperledger/cactus-plugin-consortium-manual": "^0.2.0",
     "@hyperledger/cactus-plugin-keychain-memory": "^0.2.0",

diff --git a/packages/cactus-cmd-api-server/src/main/typescript/api-server.ts b/packages/cactus-cmd-api-server/src/main/typescript/api-server.ts
@@ -22,8 +22,8 @@ import {
   ICactusPlugin,
   isIPluginWebService,
   IPluginWebService,
-  PluginRegistry,
 } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 import { ICactusApiServerOptions } from "./config/config-service";
 import { CACTUS_OPEN_API_JSON } from "./openapi-spec";
 import { Logger, LoggerProvider, Servers } from "@hyperledger/cactus-common";

diff --git a/...ages/cactus-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts b/...ages/cactus-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts
@@ -2,7 +2,7 @@ import test, { Test } from "tape-promise/tape";
 import { v4 as uuidv4 } from "uuid";
 
 import { LogLevelDesc } from "@hyperledger/cactus-common";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 import { ApiServer, ConfigService } from "../../../main/typescript/public-api";
 import { IPluginKeychainMemoryOptions } from "../../../../../cactus-plugin-keychain-memory/dist/types/main/typescript";

diff --git a/packages/cactus-core-api/src/main/typescript/public-api.ts b/packages/cactus-core-api/src/main/typescript/public-api.ts
@@ -15,4 +15,3 @@ export {
   isICactusPlugin,
 } from "./plugin/i-cactus-plugin";
 export { PluginAspect } from "./plugin/plugin-aspect";
-export { PluginRegistry } from "./plugin/plugin-registry";
diff --git a/...main/typescript/plugin/plugin-registry.ts → ...re/src/main/typescript/plugin-registry.ts b/...main/typescript/plugin/plugin-registry.ts → ...re/src/main/typescript/plugin-registry.ts
@@ -1,7 +1,10 @@
 import { Optional } from "typescript-optional";
-import { ICactusPlugin, isICactusPlugin } from "../plugin/i-cactus-plugin";
-import { PluginAspect } from "../plugin/plugin-aspect";
-import { IPluginKeychain } from "./keychain/i-plugin-keychain";
+import {
+  ICactusPlugin,
+  IPluginKeychain,
+  isICactusPlugin,
+  PluginAspect,
+} from "@hyperledger/cactus-core-api";
 
 /**
  * This interface describes the constructor options object that can be used to provide configuration parameters to

diff --git a/packages/cactus-core/src/main/typescript/public-api.ts b/packages/cactus-core/src/main/typescript/public-api.ts
@@ -1 +1,2 @@
 export { registerWebServiceEndpoint } from "./web-services/register-web-service-endpoint";
+export { IPluginRegistryOptions, PluginRegistry } from "./plugin-registry";
diff --git a/...t/typescript/unit/plugin-registry.test.ts → ...t/typescript/unit/plugin-registry.test.ts b/...t/typescript/unit/plugin-registry.test.ts → ...t/typescript/unit/plugin-registry.test.ts
@@ -1,12 +1,13 @@
 import test, { Test } from "tape";
 import { v4 as uuidv4 } from "uuid";
 
+import { PluginRegistry } from "../../../main/typescript/public-api";
+
 import {
   ICactusPlugin,
   IPluginKeychain,
   PluginAspect,
-  PluginRegistry,
-} from "../../../main/typescript/public-api";
+} from "@hyperledger/cactus-core-api";
 
 test("PluginRegistry", (tMain: Test) => {
   test("findOneByKeychainId() finds plugin by keychain ID", (t: Test) => {

diff --git a/packages/cactus-plugin-consortium-manual/src/main/typescript/plugin-consortium-manual.ts b/packages/cactus-plugin-consortium-manual/src/main/typescript/plugin-consortium-manual.ts
@@ -9,11 +9,13 @@ import {
   Consortium,
   IPluginWebService,
   PluginAspect,
-  PluginRegistry,
   IWebServiceEndpoint,
   ICactusPlugin,
   ICactusPluginOptions,
 } from "@hyperledger/cactus-core-api";
+
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   Checks,
   Logger,

diff --git a/...s/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts b/...s/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts
@@ -17,10 +17,11 @@ import {
   PluginAspect,
   ICactusPlugin,
   ICactusPluginOptions,
-  PluginRegistry,
   IPluginKeychain,
 } from "@hyperledger/cactus-core-api";
 
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   Checks,
   Logger,

diff --git a/...ntegration/plugin-ledger-connector-besu/deploy-contract/deploy-contract-from-json.test.ts b/...ntegration/plugin-ledger-connector-besu/deploy-contract/deploy-contract-from-json.test.ts
@@ -1,6 +1,6 @@
 import test, { Test } from "tape";
 import { v4 as uuidv4 } from "uuid";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 import {
   EthContractInvocationType,
   Web3SigningCredentialType,

diff --git a/...ctus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts b/...ctus-plugin-ledger-connector-fabric/src/main/typescript/plugin-ledger-connector-fabric.ts
@@ -22,9 +22,10 @@ import {
   IWebServiceEndpoint,
   ICactusPlugin,
   ICactusPluginOptions,
-  PluginRegistry,
 } from "@hyperledger/cactus-core-api";
 
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   Logger,
   Checks,

diff --git a/...n/deploy-contract-go-bin-endpoint-v1/deploy-contract/deploy-cc-from-golang-source.test.ts b/...n/deploy-contract-go-bin-endpoint-v1/deploy-contract/deploy-cc-from-golang-source.test.ts
@@ -18,7 +18,7 @@ import {
   LogLevelDesc,
   Servers,
 } from "@hyperledger/cactus-common";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 import {
   PluginLedgerConnectorFabric,

diff --git a/...dger-connector-fabric/src/test/typescript/integration/run-transaction-endpoint-v1.test.ts b/...dger-connector-fabric/src/test/typescript/integration/run-transaction-endpoint-v1.test.ts
@@ -8,7 +8,7 @@ import bodyParser from "body-parser";
 import express from "express";
 
 import { FabricTestLedgerV1 } from "@hyperledger/cactus-test-tooling";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 import {
   IListenOptions,

diff --git a/...ctus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts b/...ctus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts
@@ -16,10 +16,11 @@ import {
   PluginAspect,
   ICactusPlugin,
   ICactusPluginOptions,
-  PluginRegistry,
   IPluginKeychain,
 } from "@hyperledger/cactus-core-api";
 
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   Checks,
   Logger,

diff --git a/...egration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-from-json.test.ts b/...egration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-from-json.test.ts
@@ -24,7 +24,7 @@ import {
   IQuorumGenesisOptions,
   IAccount,
 } from "@hyperledger/cactus-test-tooling";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 const logLevel: LogLevelDesc = "INFO";
 const log: Logger = LoggerProvider.getOrCreate({

diff --git a/packages/cactus-plugin-validator-besu/src/main/typescript/plugin-validator-besu.ts b/packages/cactus-plugin-validator-besu/src/main/typescript/plugin-validator-besu.ts
@@ -10,11 +10,13 @@ import bodyParser from "body-parser";
 import {
   IPluginWebService,
   PluginAspect,
-  PluginRegistry,
   IWebServiceEndpoint,
   ICactusPlugin,
   ICactusPluginOptions,
 } from "@hyperledger/cactus-core-api";
+
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import {
   LogLevelDesc,
   Logger,

diff --git a/packages/cactus-test-api-client/package.json b/packages/cactus-test-api-client/package.json
@@ -65,6 +65,7 @@
     "@hyperledger/cactus-api-client": "^0.2.0",
     "@hyperledger/cactus-cmd-api-server": "^0.2.0",
     "@hyperledger/cactus-common": "^0.2.0",
+    "@hyperledger/cactus-core": "^0.2.0",
     "@hyperledger/cactus-core-api": "^0.2.0",
     "@hyperledger/cactus-plugin-consortium-manual": "^0.2.0",
     "@hyperledger/cactus-plugin-ledger-connector-besu": "^0.2.0",

diff --git a/...s-test-api-client/src/test/typescript/integration/api-client-routing-node-to-node.test.ts b/...s-test-api-client/src/test/typescript/integration/api-client-routing-node-to-node.test.ts
@@ -7,12 +7,8 @@ import Web3 from "web3";
 
 import { ApiClient } from "@hyperledger/cactus-api-client";
 import { ApiServer, ConfigService } from "@hyperledger/cactus-cmd-api-server";
-import {
-  PluginRegistry,
-  Consortium,
-  Ledger,
-  LedgerType,
-} from "@hyperledger/cactus-core-api";
+import { Consortium, Ledger, LedgerType } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 import {
   DefaultApi as QuorumApi,
   PluginLedgerConnectorQuorum,

diff --git a/...cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts b/...cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts
@@ -2,7 +2,6 @@ import test, { Test } from "tape-promise/tape";
 import { v4 as uuidv4 } from "uuid";
 
 import { LogLevelDesc } from "@hyperledger/cactus-common";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
 
 import { ApiServer, ConfigService } from "@hyperledger/cactus-cmd-api-server";
 import { IPluginKeychainMemoryOptions } from "@hyperledger/cactus-plugin-keychain-memory";

diff --git a/packages/cactus-test-plugin-consortium-manual/package.json b/packages/cactus-test-plugin-consortium-manual/package.json
@@ -64,6 +64,7 @@
   "dependencies": {
     "@hyperledger/cactus-cmd-api-server": "^0.2.0",
     "@hyperledger/cactus-common": "^0.2.0",
+    "@hyperledger/cactus-core": "^0.2.0",
     "@hyperledger/cactus-core-api": "^0.2.0",
     "@hyperledger/cactus-plugin-consortium-manual": "^0.2.0",
     "@hyperledger/cactus-plugin-kv-storage-memory": "^0.2.0",

diff --git a/.../test/typescript/integration/plugin-consortium-manual/get-consortium-jws-endpoint.test.ts b/.../test/typescript/integration/plugin-consortium-manual/get-consortium-jws-endpoint.test.ts
@@ -12,7 +12,8 @@ import {
   DefaultApi,
   Configuration,
 } from "@hyperledger/cactus-plugin-consortium-manual";
-import { Consortium, PluginRegistry } from "@hyperledger/cactus-core-api";
+import { Consortium } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 test("member node public keys and hosts are pre-shared", async (t: Test) => {
   const consortiumId = uuidV4();

diff --git a/...ypescript/integration/plugin-consortium-manual/security-isolation-via-api-server-ports.ts b/...ypescript/integration/plugin-consortium-manual/security-isolation-via-api-server-ports.ts
@@ -10,8 +10,9 @@ import {
   CactusNode,
   ConsortiumMember,
   Consortium,
-  PluginRegistry,
 } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
+
 import { PluginKVStorageMemory } from "@hyperledger/cactus-plugin-kv-storage-memory";
 import {
   DefaultApi as DefaultApiPlugin,

diff --git a/packages/cactus-test-plugin-ledger-connector-quorum/package.json b/packages/cactus-test-plugin-ledger-connector-quorum/package.json
@@ -64,6 +64,7 @@
   "dependencies": {
     "@hyperledger/cactus-cmd-api-server": "^0.2.0",
     "@hyperledger/cactus-common": "^0.2.0",
+    "@hyperledger/cactus-core": "^0.2.0",
     "@hyperledger/cactus-core-api": "^0.2.0",
     "@hyperledger/cactus-plugin-consortium-manual": "^0.2.0",
     "@hyperledger/cactus-plugin-kv-storage-memory": "^0.2.0",

diff --git a/...on/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-via-web-service.test.ts b/...on/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-via-web-service.test.ts
@@ -24,7 +24,8 @@ import {
   ICactusApiServerOptions,
 } from "@hyperledger/cactus-cmd-api-server";
 
-import { ICactusPlugin, PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
+import { ICactusPlugin } from "@hyperledger/cactus-core-api";
 import { PluginKVStorageMemory } from "@hyperledger/cactus-plugin-kv-storage-memory";
 
 const log: Logger = LoggerProvider.getOrCreate({

diff --git a/packages/cactus-test-plugin-validator-besu/package.json b/packages/cactus-test-plugin-validator-besu/package.json
@@ -64,6 +64,7 @@
   "dependencies": {
     "@hyperledger/cactus-cmd-api-server": "^0.2.0",
     "@hyperledger/cactus-common": "^0.2.0",
+    "@hyperledger/cactus-core": "^0.2.0",
     "@hyperledger/cactus-core-api": "^0.2.0",
     "@hyperledger/cactus-plugin-validator-besu": "^0.2.0",
     "@hyperledger/cactus-test-tooling": "^0.2.0",

diff --git a/...u/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts b/...u/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts
@@ -22,7 +22,7 @@ import {
   SignTransactionRequest,
   Configuration,
 } from "@hyperledger/cactus-plugin-validator-besu";
-import { PluginRegistry } from "@hyperledger/cactus-core-api";
+import { PluginRegistry } from "@hyperledger/cactus-core";
 
 test("Test sign transaction endpoint", async (t: Test) => {
   const httpServer1 = createServer();
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export { registerWebServiceEndpoint } from "./web-services/register-web-service-endpoint";
		export { IPluginRegistryOptions, PluginRegistry } from "./plugin-registry";