From 4521d10e34c556434fe551f6d55100198b4d469d Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Fri, 31 May 2024 23:41:18 -0700 Subject: [PATCH] test(plugin-consortium-manual): fix API server CRPC port allocation 1. Also sneaking in a fix for a DCI-Lint failure that was introduced recently when we added a new Yarn plugin which then stored its install URL in the .yarnrc.yml file and it uses the old git default main branch name and does not support the new one so we had to exclude the config file from linting. 2. Also ensured that the ConnectRPC ports are bound to zero in all tests where the API server is being used. This will prevent port conflicts randomly popping up across the test suite in the future. 3. Also removed a few test cases from the taprc file because they were already migrated to Jest and therefore tap should not run them as they fail with the Jest syntax. 4. Also fixing the lack of etherscan API key environment variable in the HTLC coordinator tests. Signed-off-by: Peter Somogyvari --- .dcilintignore | 4 ++++ .github/workflows/ci.yaml | 1 + .taprc | 2 -- .../src/main/typescript/carbon-accounting-app.ts | 1 + .../typescript/integration/admin-enroll-v1-endpoint.test.ts | 1 + .../src/main/typescript/supply-chain-app.ts | 1 + jest.config.js | 1 - .../typescript/benchmark/run-cmd-api-server-benchmark.ts | 1 + .../integration/jwt-endpoint-authorization.test.ts | 1 + .../jwt-endpoint-authz-scope-enforcement.test.ts | 1 + .../integration/jwt-socketio-endpoint-authorization.test.ts | 1 + .../jwt-unprotected-endpoint-authz-ops-confirm.test.ts | 1 + .../integration/jwt-unprotected-endpoint-authz.test.ts | 1 + .../integration/plugin-import-from-github.test.ts | 1 + .../integration/plugin-import-without-install.test.ts | 3 +++ .../typescript/integration/remote-plugin-imports.test.ts | 1 + .../typescript/unit/get-open-api-spec-v1-endpoint.test.ts | 1 + .../unit/grpc-js-proto-loader-client-healthcheck.test.ts | 1 + .../unit/grpc-proto-gen-ts-client-healthcheck.test.ts | 1 + .../unit/grpc-proto-gen-ts-client-m-tls-enabled.test.ts | 1 + .../plugins/install-basic-plugin-consortium-manual.test.ts | 1 + .../plugins/install-basic-plugin-keychain-memory.test.ts | 1 + .../integration/api-client-routing-node-to-node.test.ts | 2 ++ ...plugin-import-with-npm-install-version-selection.test.ts | 1 + .../integration/plugin-import-with-npm-install.test.ts | 1 + .../typescript/integration/remote-plugin-imports.test.ts | 1 + .../typescript/integration/runtime-plugin-imports.test.ts | 1 + .../get-consortium-jws-endpoint.test.ts | 2 ++ .../openapi/openapi-validation.test.ts | 6 ++++++ .../grpc-services/connector-besu-grpc-services.test.ts | 1 + .../plugin-validator-besu/get-balance-endpoint.test.ts | 1 + .../plugin-validator-besu/get-block-endpoint.test.ts | 1 + .../plugin-validator-besu/get-past-logs-endpoint.test.ts | 1 + .../plugin-validator-besu/get-transaction-endpoint.test.ts | 1 + .../plugin-validator-besu/sign-transaction-endpoint.test.ts | 1 + 35 files changed, 45 insertions(+), 3 deletions(-) diff --git a/.dcilintignore b/.dcilintignore index 0a5a91f2c7..cfd767c057 100644 --- a/.dcilintignore +++ b/.dcilintignore @@ -29,3 +29,7 @@ CHANGELOG.md # Ignore the Gradle Wrapper scripts because they are vendored dependencies that we cannot alter **/gradlew + +# We can't get around this one because there's a yarn plugin whose install URL +# only supports the old default branch name in git +.yarnrc.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7766c2726c..f2c3325e16 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1961,6 +1961,7 @@ jobs: ctp-htlc-eth-besu: continue-on-error: false env: + ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }} FULL_BUILD_DISABLED: true JEST_TEST_PATTERN: packages/cactus-test-plugin-htlc-eth-besu/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts JEST_TEST_RUNNER_DISABLED: false diff --git a/.taprc b/.taprc index 20c974b92b..e4dd236583 100644 --- a/.taprc +++ b/.taprc @@ -15,7 +15,6 @@ files: - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object-endpoints.test.ts - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/openapi/openapi-validation-no-keychain.test.ts - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-invoke-contract-json-object.test.ts - - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json.test.ts - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v21.4.1-deploy-contract-from-json-json-object.test.ts - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object.test.ts - ./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/openapi/openapi-validation.test.ts @@ -34,7 +33,6 @@ files: - ./packages/cactus-test-plugin-htlc-eth-besu-erc20/src/test/typescript/integration/plugin-htlc-eth-besu-erc20/get-status-endpoint.test.ts - ./packages/cactus-test-plugin-htlc-eth-besu-erc20/src/test/typescript/integration/plugin-htlc-eth-besu-erc20/openapi/openapi-validation.test.ts - ./packages/cactus-test-plugin-htlc-eth-besu-erc20/src/test/typescript/integration/plugin-htlc-eth-besu-erc20/refund-endpoint.test.ts - - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts - ./packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts - ./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/openapi/openapi-validation.test.ts - ./packages/cactus-plugin-ledger-connector-corda/src/test/typescript/integration/deploy-cordapp-jars-to-nodes-v4.7.test.ts diff --git a/examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app.ts b/examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app.ts index d720ec77c4..279e140b30 100644 --- a/examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app.ts +++ b/examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app.ts @@ -234,6 +234,7 @@ export class CarbonAccountingApp { config.cockpitPort = addressInfoCockpit.port; config.grpcPort = 0; // TODO - make this configurable as well config.logLevel = this.options.logLevel || "INFO"; + config.crpcPort = 0; } const apiServer = new ApiServer({ diff --git a/examples/cactus-example-carbon-accounting-backend/src/test/typescript/integration/admin-enroll-v1-endpoint.test.ts b/examples/cactus-example-carbon-accounting-backend/src/test/typescript/integration/admin-enroll-v1-endpoint.test.ts index 4bef291316..11c4f0cffa 100644 --- a/examples/cactus-example-carbon-accounting-backend/src/test/typescript/integration/admin-enroll-v1-endpoint.test.ts +++ b/examples/cactus-example-carbon-accounting-backend/src/test/typescript/integration/admin-enroll-v1-endpoint.test.ts @@ -92,6 +92,7 @@ test.skip(testCase, async (t: Test) => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; const convictConfig = await configService.newExampleConfigConvict(apiSrvOpts); 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 75aeb381ed..56e7b7d199 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 @@ -589,6 +589,7 @@ export class SupplyChainApp { properties.authorizationProtocol = AuthorizationProtocol.JSON_WEB_TOKEN; properties.authorizationConfigJson = await this.getOrCreateAuthorizationConfig(); + properties.crpcPort = 0; const apiServer = new ApiServer({ config: properties, diff --git a/jest.config.js b/jest.config.js index 2d17f997ae..591f13270c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -26,7 +26,6 @@ module.exports = { `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object-endpoints.test.ts`, `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/openapi/openapi-validation-no-keychain.test.ts`, `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-invoke-contract-json-object.test.ts`, - `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json.test.ts`, `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v21.4.1-deploy-contract-from-json-json-object.test.ts`, `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/v2.3.0-deploy-contract-from-json-json-object.test.ts`, `./packages/cactus-plugin-ledger-connector-quorum/src/test/typescript/integration/plugin-ledger-connector-quorum/deploy-contract/openapi/openapi-validation.test.ts`, diff --git a/packages/cactus-cmd-api-server/src/test/typescript/benchmark/run-cmd-api-server-benchmark.ts b/packages/cactus-cmd-api-server/src/test/typescript/benchmark/run-cmd-api-server-benchmark.ts index f44b2a6435..2babf8ff13 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/benchmark/run-cmd-api-server-benchmark.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/benchmark/run-cmd-api-server-benchmark.ts @@ -82,6 +82,7 @@ const createTestInfrastructure = async (opts: { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.grpcMtlsEnabled = false; apiSrvOpts.plugins = []; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authorization.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authorization.test.ts index d86a75704b..2e0d8c7e57 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authorization.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authorization.test.ts @@ -72,6 +72,7 @@ describe(testCase, () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; const config = await configService.newExampleConfigConvict(apiSrvOpts); diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authz-scope-enforcement.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authz-scope-enforcement.test.ts index 0f9c776d39..9efbda3329 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authz-scope-enforcement.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-endpoint-authz-scope-enforcement.test.ts @@ -72,6 +72,7 @@ describe(testCase, () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; const config = await configService.newExampleConfigConvict(apiSrvOpts); diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-socketio-endpoint-authorization.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-socketio-endpoint-authorization.test.ts index 52d65d9fda..38b636d7c4 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-socketio-endpoint-authorization.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-socketio-endpoint-authorization.test.ts @@ -64,6 +64,7 @@ describe("cmd-api-server:ApiServer", () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.logLevel = logLevel; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz-ops-confirm.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz-ops-confirm.test.ts index d19a1baaad..a21c3d2463 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz-ops-confirm.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz-ops-confirm.test.ts @@ -59,6 +59,7 @@ test(testCase, async () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; const config = await configService.newExampleConfigConvict(apiSrvOpts); diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz.test.ts index f58059f4a1..8b6c799e0e 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/jwt-unprotected-endpoint-authz.test.ts @@ -76,6 +76,7 @@ describe(testCase, () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.plugins = []; const config = await configService.newExampleConfigConvict(apiSrvOpts); diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-from-github.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-from-github.test.ts index a01a884574..4445c7aa68 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-from-github.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-from-github.test.ts @@ -34,6 +34,7 @@ test("can install plugins at runtime with specified version based on imports", a apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-without-install.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-without-install.test.ts index fdbb5b13b4..2aa05f66c3 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-without-install.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/plugin-import-without-install.test.ts @@ -37,6 +37,7 @@ test("can instantiate plugins at runtime without install them", async (t: Test) apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const instanceId = uuidv4(); @@ -86,6 +87,7 @@ test("can instantiate plugins at runtime without install them", async (t: Test) apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const versionToSendServer = "0.7.0"; @@ -183,6 +185,7 @@ test("can instantiate plugins at runtime without install them", async (t: Test) apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const versionToInstall = "0.8.0"; apiServerOptions.plugins = [ diff --git a/packages/cactus-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts index f8178adfb6..5792139b0b 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts @@ -79,6 +79,7 @@ test("NodeJS API server + Rust plugin work together", async (t: Test) => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/get-open-api-spec-v1-endpoint.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/get-open-api-spec-v1-endpoint.test.ts index 24a94e473d..5b44fa205a 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/get-open-api-spec-v1-endpoint.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/get-open-api-spec-v1-endpoint.test.ts @@ -76,6 +76,7 @@ describe("cmd-api-server:getOpenApiSpecV1Endpoint", () => { apiSrvOpts.apiPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.apiTlsEnabled = false; apiSrvOpts.grpcMtlsEnabled = false; apiSrvOpts.plugins = []; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-js-proto-loader-client-healthcheck.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-js-proto-loader-client-healthcheck.test.ts index 8382d51e80..3e844bacd9 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-js-proto-loader-client-healthcheck.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-js-proto-loader-client-healthcheck.test.ts @@ -26,6 +26,7 @@ test(testCase, async (t: Test) => { apiSrvOpts.apiCorsDomainCsv = "*"; apiSrvOpts.apiPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcMtlsEnabled = false; apiSrvOpts.apiTlsEnabled = false; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-healthcheck.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-healthcheck.test.ts index 3de32ec2b0..b996e296a6 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-healthcheck.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-healthcheck.test.ts @@ -23,6 +23,7 @@ test(testCase, async (t: Test) => { apiSrvOpts.apiCorsDomainCsv = "*"; apiSrvOpts.apiPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcMtlsEnabled = false; apiSrvOpts.apiTlsEnabled = false; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-m-tls-enabled.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-m-tls-enabled.test.ts index 7e3a96da8d..c7b39a7120 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-m-tls-enabled.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/grpc-proto-gen-ts-client-m-tls-enabled.test.ts @@ -34,6 +34,7 @@ test(testCase, async (t: Test) => { apiSrvOpts.apiTlsKeyPem = serverCert.privateKeyPem; apiSrvOpts.apiTlsClientCaPem = clientCert.certificatePem; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcMtlsEnabled = true; apiSrvOpts.apiTlsEnabled = false; diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-consortium-manual.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-consortium-manual.test.ts index e777a5be11..0bca605609 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-consortium-manual.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-consortium-manual.test.ts @@ -61,6 +61,7 @@ test("can install plugin-consortium-manual", async (t: Test) => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { diff --git a/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-keychain-memory.test.ts b/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-keychain-memory.test.ts index 888ac99e90..3661fe0589 100644 --- a/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-keychain-memory.test.ts +++ b/packages/cactus-cmd-api-server/src/test/typescript/unit/plugins/install-basic-plugin-keychain-memory.test.ts @@ -44,6 +44,7 @@ test("can import plugins at runtime (CLI)", async (t: Test) => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { 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 518f2b2980..49bea86fb8 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 @@ -203,6 +203,7 @@ describe(testCase, () => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.crpcPort = 0; const config = @@ -249,6 +250,7 @@ describe(testCase, () => { apiServerOptions.apiPort = addressInfo2.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = []; apiServerOptions.crpcPort = 0; diff --git a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts index 1a3be92c69..59988e1d42 100644 --- a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts +++ b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install-version-selection.test.ts @@ -35,6 +35,7 @@ test("can install plugins at runtime with specified version based on imports", a apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { diff --git a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts index 63404b0007..d5c25cbfee 100644 --- a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts +++ b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/plugin-import-with-npm-install.test.ts @@ -52,6 +52,7 @@ describe(testcase, () => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { diff --git a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts index 864409efca..068b0eed3e 100644 --- a/packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts +++ b/packages/cactus-test-cmd-api-server/src/test/typescript/integration/remote-plugin-imports.test.ts @@ -80,6 +80,7 @@ describe(testCase, () => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = []; const config = 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 d89a4fdb1c..7a9e56fc91 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 @@ -38,6 +38,7 @@ describe(testCase, () => { apiServerOptions.apiPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = [ { 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 f359eb29ed..e85591c5bd 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 @@ -265,6 +265,7 @@ describe(testCase, () => { apiServerOptions.apiPort = addressInfo2.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = []; apiServerOptions.crpcPort = 0; @@ -317,6 +318,7 @@ describe(testCase, () => { apiServerOptions.apiPort = addressInfo3.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; apiServerOptions.plugins = []; apiServerOptions.crpcPort = 0; diff --git a/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/openapi/openapi-validation.test.ts b/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/openapi/openapi-validation.test.ts index 37a7263122..a622f4e008 100644 --- a/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/openapi/openapi-validation.test.ts +++ b/packages/cactus-test-plugin-consortium-manual/src/test/typescript/integration/plugin-consortium-manual/openapi/openapi-validation.test.ts @@ -160,8 +160,10 @@ test(testCase, async (t: Test) => { apiServerOptions.apiCorsDomainCsv = "*"; apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.cockpitPort = 0; apiServerOptions.apiTlsEnabled = false; + apiServerOptions.crpcPort = 0; const config = await configService.newExampleConfigConvict(apiServerOptions); @@ -198,7 +200,9 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo2.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; + apiServerOptions.crpcPort = 0; const config = await configService.newExampleConfigConvict(apiServerOptions); @@ -235,7 +239,9 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo3.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; + apiServerOptions.crpcPort = 0; const config = await configService.newExampleConfigConvict(apiServerOptions); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/grpc-services/connector-besu-grpc-services.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/grpc-services/connector-besu-grpc-services.test.ts index cf0954e9b6..e995cb0b6a 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/grpc-services/connector-besu-grpc-services.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/grpc-services/connector-besu-grpc-services.test.ts @@ -117,6 +117,7 @@ describe("BesuGrpcSvcOpenApi", () => { apiSrvOpts.apiPort = addressInfo.port; apiSrvOpts.cockpitPort = 0; apiSrvOpts.grpcPort = 0; + apiSrvOpts.crpcPort = 0; apiSrvOpts.grpcMtlsEnabled = false; apiSrvOpts.apiTlsEnabled = false; const cfg = await cfgSrv.newExampleConfigConvict(apiSrvOpts); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-balance-endpoint.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-balance-endpoint.test.ts index e32e834119..e92e60a8f8 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-balance-endpoint.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-balance-endpoint.test.ts @@ -106,6 +106,7 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const config = await configService.newExampleConfigConvict(apiServerOptions); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-block-endpoint.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-block-endpoint.test.ts index 2c10383ca9..169a489910 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-block-endpoint.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-block-endpoint.test.ts @@ -104,6 +104,7 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const config = await configService.newExampleConfigConvict(apiServerOptions); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-past-logs-endpoint.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-past-logs-endpoint.test.ts index 6ac37655f2..169265fe5a 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-past-logs-endpoint.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-past-logs-endpoint.test.ts @@ -106,6 +106,7 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const config = await configService.newExampleConfigConvict(apiServerOptions); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-transaction-endpoint.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-transaction-endpoint.test.ts index 3c5f24b21b..14e1b79d45 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-transaction-endpoint.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/get-transaction-endpoint.test.ts @@ -106,6 +106,7 @@ test(testCase, async (t: Test) => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const config = await configService.newExampleConfigConvict(apiServerOptions); diff --git a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts index 75c40ed146..db85b1d7d5 100644 --- a/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts +++ b/packages/cactus-test-plugin-ledger-connector-besu/src/test/typescript/integration/plugin-validator-besu/sign-transaction-endpoint.test.ts @@ -112,6 +112,7 @@ describe(testCase, () => { apiServerOptions.apiPort = addressInfo1.port; apiServerOptions.cockpitPort = 0; apiServerOptions.grpcPort = 0; + apiServerOptions.crpcPort = 0; apiServerOptions.apiTlsEnabled = false; const config = await configService.newExampleConfigConvict(apiServerOptions);