diff --git a/examples/cactus-example-supply-chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts b/examples/cactus-example-supply-chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts index f5f9c7ad1bc..c7caff4693b 100644 --- a/examples/cactus-example-supply-chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts +++ b/examples/cactus-example-supply-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 index 3058de6e564..61e85705a61 100644 --- 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 index be8e6f21c58..14e31fded75 100644 --- 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-keychain-memory": "0.2.0", "@hyperledger/cactus-plugin-kv-storage-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 index ee478a690f2..37e846b36c7 100644 --- 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/packages/cactus-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts index e01834c63d2..0cf7d3d2965 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts +++ b/packages/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 index f48d80eeaa9..268c97542c3 100755 --- 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/packages/cactus-core-api/src/main/typescript/plugin/plugin-registry.ts b/packages/cactus-core/src/main/typescript/plugin-registry.ts similarity index 94% rename from packages/cactus-core-api/src/main/typescript/plugin/plugin-registry.ts rename to packages/cactus-core/src/main/typescript/plugin-registry.ts index 875c2e542be..84dcce5eda2 100644 --- a/packages/cactus-core-api/src/main/typescript/plugin/plugin-registry.ts +++ b/packages/cactus-core/src/main/typescript/plugin-registry.ts @@ -1,6 +1,9 @@ import { Optional } from "typescript-optional"; -import { ICactusPlugin, isICactusPlugin } from "../plugin/i-cactus-plugin"; -import { PluginAspect } from "../plugin/plugin-aspect"; +import { + ICactusPlugin, + isICactusPlugin, +} from "@hyperledger/cactus-core-api/src/main/typescript/plugin/i-cactus-plugin"; +import { PluginAspect } from "@hyperledger/cactus-core-api/src/main/typescript/plugin/plugin-aspect"; /** * 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 index 863b1b2e6b8..111a92d7ab7 100755 --- 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/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 index 33e6f629d45..eec78da12e9 100644 --- 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/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts b/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts index 2b69484381f..7a5a666e312 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/main/typescript/plugin-ledger-connector-besu.ts +++ b/packages/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/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/deploy-contract-from-json.test.ts b/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/deploy-contract-from-json.test.ts index ec3eb32fd38..b611a030a0a 100644 --- a/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-ledger-connector-besu/deploy-contract/deploy-contract-from-json.test.ts +++ b/packages/cactus-plugin-ledger-connector-besu/src/test/typescript/integration/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/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts b/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts index d4d97686ddf..8dea6031185 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/src/main/typescript/plugin-ledger-connector-quorum.ts +++ b/packages/cactus-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/packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-from-json.test.ts b/packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-from-json.test.ts index 95e79994d8d..59a0acf4e51 100644 --- a/packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-from-json.test.ts +++ b/packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/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 index a1897d6ce49..a6a676bf528 100644 --- 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 index 926ab1ab769..4c0ab87bfb8 100644 --- a/packages/cactus-test-api-client/package.json +++ b/packages/cactus-test-api-client/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-ledger-connector-besu": "^0.2.0", diff --git a/packages/cactus-test-api-client/src/test/typescript/integration/api-client-routing-node-to-node.test.ts b/packages/cactus-test-api-client/src/test/typescript/integration/api-client-routing-node-to-node.test.ts index acc659e7e04..a6442cc79a3 100644 --- a/packages/cactus-test-api-client/src/test/typescript/integration/api-client-routing-node-to-node.test.ts +++ b/packages/cactus-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/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts index 02b1c2f6abe..eba388c3b48 100644 --- a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/runtime-plugin-imports.test.ts +++ b/packages/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 index 17763b1d9e5..5e870d9f35a 100644 --- 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/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/get-consortium-jws-endpoint.test.ts b/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/get-consortium-jws-endpoint.test.ts index 953b0a6eaca..eeaf1537327 100644 --- a/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/get-consortium-jws-endpoint.test.ts +++ b/packages/cactus-test-plugin-consortium-manual/src/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/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/security-isolation-via-api-server-ports.ts b/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/security-isolation-via-api-server-ports.ts index 99c63b0f149..8e7203ae682 100644 --- a/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/security-isolation-via-api-server-ports.ts +++ b/packages/cactus-test-plugin-consortium-manual/src/test/typescript/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 index a5470869f03..e7a769acd1c 100644 --- 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/packages/cactus-test-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-via-web-service.test.ts b/packages/cactus-test-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-via-web-service.test.ts index d2bc2d7a2ed..8060aa1c99b 100644 --- a/packages/cactus-test-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/deploy-contract-via-web-service.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-quorum/src/test/typescript/integration/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 index 9bbe78fcf5f..11e65d6bbe0 100644 --- 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/packages/cactus-test-plugin-validator-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts b/packages/cactus-test-plugin-validator-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts index e4f99bdbe74..48f6ab2096f 100644 --- a/packages/cactus-test-plugin-validator-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts +++ b/packages/cactus-test-plugin-validator-besu/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();