fix(satp-hermes): fix build bugs and hanging tests

Co-authored-by: André Augusto <andre.augusto@tecnico.ulisboa.pt> Co-authored-by: Peter Somogyvari <peter.somogyvari@accenture.com> Co-authored-by: Rafael Belchior <rafael.belchior@tecnico.ulisboa.pt> Signed-off-by: Rafael Belchior <rafael.belchior@tecnico.ulisboa.pt> test(satp-hermes): fix hanging tests Signed-off-by: Rafael Belchior <rafael.belchior@tecnico.ulisboa.pt> refactor(SATP-Hermes): fix cspell and lint Signed-off-by: André Augusto <andre.augusto@tecnico.ulisboa.pt>
eduv09 · Sep 27, 2024 · 8dcb451 · 8dcb451
1 parent dc33d0c
commit 8dcb451
Show file tree

Hide file tree

Showing 47 changed files with 778 additions and 619 deletions.
diff --git a/packages/cactus-plugin-satp-hermes/package.json b/packages/cactus-plugin-satp-hermes/package.json
@@ -45,8 +45,8 @@
   "scripts": {
     "build": "run-p tsc codegen",
     "build-proto": "buf build --path src/main/proto --verbose",
-    "build:dev:backend:postbuild": "mkdir -p ./dist/lib/main/knex && cp -r ./knex/* ./dist/lib/main/knex",
-    "codegen": "yarn run --top-level run-s 'codegen:*'",
+    "build:dev:backend:postbuild": "mkdir -p ./dist/lib/knex && cp -r ./src/knex/* ./dist/lib/knex",
+    "codegen": "run-p 'codegen:*'",
     "codegen:openapi": "npm run generate-sdk",
     "codegen:proto": "npm run generate-proto",
     "generate-proto": "cd src/main/proto && buf generate --template buf.gen.yaml --config buf.yaml --verbose",

diff --git a/...lugin-satp-hermes/knex/knexfile-remote.ts → ...n-satp-hermes/src/knex/knexfile-remote.ts b/...lugin-satp-hermes/knex/knexfile-remote.ts → ...n-satp-hermes/src/knex/knexfile-remote.ts
@@ -5,7 +5,7 @@ module.exports = {
   development: {
     client: "sqlite3",
     connection: {
-      filename: path.resolve(__dirname, ".dev-remote.sqlite3"),
+      filename: path.resolve(__dirname, ".dev.remote-" + uuidv4() + ".sqlite3"),
     },
     migrations: {
       directory: path.resolve(__dirname, "migrations"),

diff --git a/...actus-plugin-satp-hermes/knex/knexfile.ts → ...s-plugin-satp-hermes/src/knex/knexfile.ts b/...actus-plugin-satp-hermes/knex/knexfile.ts → ...s-plugin-satp-hermes/src/knex/knexfile.ts
diff --git a/...tions/20220331132128_create_logs_table.js → ...tions/20220331132128_create_logs_table.js b/...tions/20220331132128_create_logs_table.js → ...tions/20220331132128_create_logs_table.js
diff --git a/...0240130234303_create_remote_logs_table.js → ...0240130234303_create_remote_logs_table.js b/...0240130234303_create_remote_logs_table.js → ...0240130234303_create_remote_logs_table.js
diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/constants.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/constants.ts
@@ -0,0 +1,3 @@
+export const DEFAULT_PORT_GATEWAY_SERVER = 3010;
+export const DEFAULT_PORT_GATEWAY_CLIENT = DEFAULT_PORT_GATEWAY_SERVER + 1;	
+export const DEFAULT_PORT_GATEWAY_UI = DEFAULT_PORT_GATEWAY_SERVER + 2;
diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-services/stage3.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-services/stage3.ts
@@ -1 +0,0 @@
-

diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-services/test-services.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-services/test-services.ts
@@ -1,5 +1,5 @@
 import { ConnectRouter } from "@connectrpc/connect";
-import { Message } from "../../generated/proto/test/message_pb";
+// import { Message } from "../../generated/proto/test/message_pb";
 import { TestService } from "../../generated/proto/test/message_connect";
 
 export const testRouter = (router: ConnectRouter) =>
@@ -8,8 +8,7 @@ export const testRouter = (router: ConnectRouter) =>
     // implements rpc Say
     async sendMessage(req) {
       return {
-        sentence: `You said: ${req}`
-      }
+        sentence: `You said: ${req}`,
+      };
     },
   });
-
diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/types.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/types.ts
@@ -1,12 +1,4 @@
-import {
-  Secp256k1Keys,
-  Logger,
-  Checks,
-  LoggerProvider,
-  JsObjectSigner,
-  IJsObjectSignerOptions,
-  LogLevelDesc,
-} from "@hyperledger/cactus-common";
+import { Secp256k1Keys, LogLevelDesc } from "@hyperledger/cactus-common";
 import { ValidatorOptions } from "class-validator";
 
 export enum CurrentDrafts {
@@ -18,7 +10,11 @@ export enum CurrentDrafts {
 export type DraftVersions = {
   [K in CurrentDrafts]: string;
 };
-export type ShutdownHook = () => Promise<void>;
+
+export type ShutdownHook = {
+  name: string;
+  hook: () => Promise<void>;
+};
 
 export enum SupportedGatewayImplementations {
   FABRIC = "FabricSATPGateway",
@@ -35,7 +31,8 @@ export type GatewayIdentity = {
   version: DraftVersions[];
   supportedChains: SupportedGatewayImplementations[];
   proofID?: string;
-  port?: number;
+  gatewayServerPort?: number;
+  gatewayClientPort?: number;
   address?:
     | `http://${string}`
     | `https://${string}`

diff --git a/...tus-plugin-satp-hermes/src/main/typescript/factory/plugin-factory-gateway-orchestrator.ts b/...tus-plugin-satp-hermes/src/main/typescript/factory/plugin-factory-gateway-orchestrator.ts
@@ -2,20 +2,15 @@ import {
   IPluginFactoryOptions,
   PluginFactory,
 } from "@hyperledger/cactus-core-api";
-import {
-  SATPGateway,
-  SATPGatewayConfig,
-} from "../gateway-refactor";
+import { SATPGateway, SATPGatewayConfig } from "../gateway-refactor";
 import { validateOrReject } from "class-validator";
 
 export class PluginFactorySATPGateway extends PluginFactory<
   SATPGateway,
   SATPGatewayConfig,
   IPluginFactoryOptions
 > {
-  async create(
-    pluginOptions: SATPGatewayConfig,
-  ): Promise<SATPGateway> {
+  async create(pluginOptions: SATPGatewayConfig): Promise<SATPGateway> {
     const coordinator = new SATPGateway(pluginOptions);
 
     try {