fix(odap-hermes): fix unresolved database config path in repositories

Signed-off-by: André Augusto <andre.augusto@tecnico.ulisboa.pt>

packages/cactus-plugin-satp-hermes/package.json

@@ -45,7 +45,7 @@
   "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",
+    "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",

packages/cactus-plugin-satp-hermes/knex/knexfile-remote.ts → packages/cactus-plugin-satp-hermes/src/knex/knexfile-remote.ts

@@ -6,7 +6,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"),

packages/cactus-plugin-satp-hermes/src/main/typescript/repository/knex-local-log-repository.ts

@@ -7,7 +7,7 @@ export class KnexLocalLogRepository implements ILocalLogRepository {
 
   public constructor(config: Knex.Config | undefined) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const configFile = require("../../../../knex/knexfile.ts")[
+    const configFile = require("../../../knex/knexfile.ts")[
       process.env.ENVIRONMENT || "development"
     ];
 

packages/cactus-plugin-satp-hermes/src/main/typescript/repository/knex-remote-log-repository.ts

@@ -10,7 +10,7 @@ export class KnexRemoteLogRepository implements IRemoteLogRepository {
   // simulating a remote log storage
   public constructor(config: Knex.Config | undefined) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const configFile = require("../../../../knex/knexfile-remote.ts")[
+    const configFile = require("../../../knex/knexfile-remote.ts")[
       process.env.ENVIRONMENT || "development"
     ];
 

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/backup-gateway-after-client-crash.test.ts

@@ -547,12 +547,16 @@ beforeAll(async () => {
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
     expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/client-crash-after-delete-asset.test.ts

@@ -544,12 +544,16 @@ beforeAll(async () => {
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
     expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/client-crash-after-lock-asset.test.ts

@@ -545,12 +545,16 @@ beforeAll(async () => {
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
     expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/client-crash-after-transfer-initiation.test.ts

@@ -88,11 +88,11 @@ beforeAll(async () => {
 
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginRecipientGateway.localRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
 
     await pluginRecipientGateway.registerWebServices(serverExpressApp);
   }

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/odap-api-call-with-ledger-connector.test.ts

@@ -507,12 +507,16 @@ beforeAll(async () => {
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
     expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/odap-api-call.test.ts

@@ -62,9 +62,15 @@ test("runs ODAP between two gateways via openApi", async () => {
 
   expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
   expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+  expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
 
   await pluginSourceGateway.localRepository?.reset();
   await pluginRecipientGateway.localRepository?.reset();
+
+  await pluginSourceGateway.remoteRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
   let serverGatewayApiHost: string;
 

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/odap-rollback.test.ts

@@ -546,8 +546,14 @@ beforeAll(async () => {
       pluginRecipientGateway.localRepository?.database,
     ).not.toBeUndefined();
 
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/odap.test.ts

@@ -44,9 +44,15 @@ test("successful run ODAP instance", async () => {
 
   expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
   expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+  expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
 
   await pluginSourceGateway.localRepository?.reset();
   await pluginRecipientGateway.localRepository?.reset();
+
+  await pluginSourceGateway.remoteRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
   const dummyPath = { apiHost: "dummyPath" };
 

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/server-crash-after-create-asset.test.ts

@@ -547,12 +547,16 @@ beforeEach(async () => {
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
     expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
-
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
+
     await pluginSourceGateway.localRepository?.reset();
     await pluginRecipientGateway.localRepository?.reset();
+
+    await pluginSourceGateway.remoteRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
   }
   {
     // Server Gateway configuration

packages/cactus-plugin-satp-hermes/src/test/typescript/integration/server-crash-after-transfer-initiation.test.ts

@@ -84,11 +84,11 @@ beforeAll(async () => {
 
     pluginRecipientGateway = new BesuSATPGateway(serverGatewayPluginOptions);
 
-    expect(
-      pluginRecipientGateway.localRepository?.database,
-    ).not.toBeUndefined();
+    expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();  
+    expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();  
 
     await pluginRecipientGateway.localRepository?.reset();
+    await pluginRecipientGateway.remoteRepository?.reset();
 
     await pluginRecipientGateway.registerWebServices(serverExpressApp);
   }
@@ -123,11 +123,11 @@ beforeAll(async () => {
 
     pluginSourceGateway = new FabricSATPGateway(clientGatewayPluginOptions);
 
-    if (pluginSourceGateway.localRepository?.database == undefined) {
-      throw new Error("Database is not correctly initialized");
-    }
+    expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
+    expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();  
 
     await pluginSourceGateway.localRepository?.reset();
+    await pluginSourceGateway.remoteRepository?.reset();
 
     await pluginSourceGateway.registerWebServices(clientExpressApp);
 
@@ -218,10 +218,10 @@ test("server gateway crashes after transfer initiation flow", async () => {
 });
 
 afterAll(async () => {
-  pluginSourceGateway.localRepository?.destroy();
-  pluginRecipientGateway.localRepository?.destroy();
-  pluginSourceGateway.remoteRepository?.destroy();
-  pluginRecipientGateway.remoteRepository?.destroy();
+  await pluginSourceGateway.localRepository?.destroy();
+  await pluginRecipientGateway.localRepository?.destroy();
+  await pluginSourceGateway.remoteRepository?.destroy();
+  await pluginRecipientGateway.remoteRepository?.destroy();
 
   await Servers.shutdown(sourceGatewayServer);
   await Servers.shutdown(recipientGatewayserver);

packages/cactus-plugin-satp-hermes/src/test/typescript/knex.config.ts

@@ -1,32 +1,34 @@
+import { v4 as uuidv4 } from "uuid";
+
 export const knexClientConnection = {
   client: "sqlite3",
   connection: {
-    filename: "./packages/cactus-plugin-satp-hermes/knex/.dev.client.sqlite3",
+    filename: "./packages/cactus-plugin-satp-hermes/src/knex/.dev.client-" + uuidv4() + ".sqlite3",
   },
   migrations: {
-    directory: "./packages/cactus-plugin-satp-hermes/knex/migrations",
+    directory: "./packages/cactus-plugin-satp-hermes/src/knex/migrations",
   },
   useNullAsDefault: true,
 };
 
 export const knexServerConnection = {
   client: "sqlite3",
   connection: {
-    filename: "./packages/cactus-plugin-satp-hermes/knex/.dev.server.sqlite3",
+    filename: "./packages/cactus-plugin-satp-hermes/src/knex/.dev.server-" + uuidv4() + ".sqlite3",
   },
   migrations: {
-    directory: "./packages/cactus-plugin-satp-hermes/knex/migrations",
+    directory: "./packages/cactus-plugin-satp-hermes/src/knex/migrations",
   },
   useNullAsDefault: true,
 };
 
 export const knexRemoteConnection = {
   client: "sqlite3",
   connection: {
-    filename: "./packages/cactus-plugin-satp-hermes/knex/.dev.remote.sqlite3",
+    filename: "./packages/cactus-plugin-satp-hermes/src/knex/.dev.remote-" + uuidv4() + ".sqlite3",
   },
   migrations: {
-    directory: "./packages/cactus-plugin-satp-hermes/knex/migrations",
+    directory: "./packages/cactus-plugin-satp-hermes/src/knex/migrations",
   },
   useNullAsDefault: true,
 };

packages/cactus-plugin-satp-hermes/src/test/typescript/unit/client/commit-final.test.ts

@@ -51,15 +51,17 @@ beforeEach(async () => {
   pluginSourceGateway = new FabricSATPGateway(sourceGatewayConstructor);
   pluginRecipientGateway = new BesuSATPGateway(recipientGatewayConstructor);
 
-  if (
-    pluginSourceGateway.localRepository?.database == undefined ||
-    pluginRecipientGateway.localRepository?.database == undefined
-  ) {
-    throw new Error("Database is not correctly initialized");
-  }
+  expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+  expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
 
   await pluginSourceGateway.localRepository?.reset();
   await pluginRecipientGateway.localRepository?.reset();
+
+  await pluginSourceGateway.remoteRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
   sequenceNumber = randomInt(100);
   sessionID = uuidv4();
@@ -88,16 +90,6 @@ beforeEach(async () => {
     operation: "create",
     data: COMMIT_ACK_CLAIM,
   });
-
-  if (
-    pluginSourceGateway.localRepository?.database == undefined ||
-    pluginRecipientGateway.localRepository?.database == undefined
-  ) {
-    throw new Error("Database is not correctly initialized");
-  }
-
-  await pluginSourceGateway.localRepository?.reset();
-  await pluginRecipientGateway.localRepository?.reset();
 });
 
 afterEach(async () => {

packages/cactus-plugin-satp-hermes/src/test/typescript/unit/client/commit-preparation.test.ts

@@ -48,15 +48,17 @@ beforeEach(async () => {
   pluginSourceGateway = new FabricSATPGateway(sourceGatewayConstructor);
   pluginRecipientGateway = new BesuSATPGateway(recipientGatewayConstructor);
 
-  if (
-    pluginSourceGateway.localRepository?.database == undefined ||
-    pluginRecipientGateway.localRepository?.database == undefined
-  ) {
-    throw new Error("Database is not correctly initialized");
-  }
+  expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+  expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
 
   await pluginSourceGateway.localRepository?.reset();
   await pluginRecipientGateway.localRepository?.reset();
+
+  await pluginSourceGateway.remoteRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
   sequenceNumber = randomInt(100);
   sessionID = uuidV4();

packages/cactus-plugin-satp-hermes/src/test/typescript/unit/client/lock-evidence.test.ts

@@ -47,15 +47,17 @@ beforeEach(async () => {
   pluginSourceGateway = new FabricSATPGateway(sourceGatewayConstructor);
   pluginRecipientGateway = new BesuSATPGateway(recipientGatewayConstructor);
 
-  if (
-    pluginSourceGateway.localRepository?.database == undefined ||
-    pluginRecipientGateway.localRepository?.database == undefined
-  ) {
-    throw new Error("Database is not correctly initialized");
-  }
+  expect(pluginSourceGateway.localRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.localRepository?.database).not.toBeUndefined();
+
+  expect(pluginSourceGateway.remoteRepository?.database).not.toBeUndefined();
+  expect(pluginRecipientGateway.remoteRepository?.database).not.toBeUndefined();
 
   await pluginSourceGateway.localRepository?.reset();
   await pluginRecipientGateway.localRepository?.reset();
+
+  await pluginSourceGateway.remoteRepository?.reset();
+  await pluginRecipientGateway.remoteRepository?.reset();
 
   sequenceNumber = randomInt(100);
   sessionID = uuidV4();