tests: general fixes to tests.

[ci skip]
MatrixAI · Oct 9, 2023 · ef77d6b · ef77d6b
1 parent c75f5da
commit ef77d6b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 22 deletions.
diff --git a/src/keys/KeyRing.ts b/src/keys/KeyRing.ts
@@ -55,7 +55,7 @@ class KeyRing {
   }: {
     keysPath: string;
     password: string;
-    options: Partial<KeyRingOptions>;
+    options?: Partial<KeyRingOptions>;
     workerManager?: PolykeyWorkerManagerInterface;
     fs?: FileSystem;
     logger?: Logger;

diff --git a/tests/discovery/Discovery.test.ts b/tests/discovery/Discovery.test.ts
@@ -85,10 +85,12 @@ describe('Discovery', () => {
     keyRing = await KeyRing.createKeyRing({
       password,
       keysPath,
+      options: {
+        passwordOpsLimit: keysUtils.passwordOpsLimits.min,
+        passwordMemLimit: keysUtils.passwordMemLimits.min,
+        strictMemoryLock: false,
+      },
       logger: logger.getChild('KeyRing'),
-      passwordOpsLimit: keysUtils.passwordOpsLimits.min,
-      passwordMemLimit: keysUtils.passwordMemLimits.min,
-      strictMemoryLock: false,
     });
     const dbPath = path.join(dataDir, 'db');
     db = await DB.createDB({
@@ -156,8 +158,10 @@ describe('Discovery', () => {
       keyRing,
       nodeGraph,
       tlsConfig,
-      connectionConnectTimeoutTime: 2000,
-      connectionIdleTimeoutTime: 2000,
+      options: {
+        connectionConnectTimeoutTime: 2000,
+        connectionIdleTimeoutTime: 2000,
+      },
       logger: logger.getChild('NodeConnectionManager'),
     });
     nodeManager = new NodeManager({

diff --git a/tests/keys/CertManager.test.ts b/tests/keys/CertManager.test.ts
@@ -39,11 +39,13 @@ describe(CertManager.name, () => {
     keyRing = await KeyRing.createKeyRing({
       keysPath,
       password,
-      privateKey,
+      options: {
+        privateKey,
+        passwordOpsLimit: keysUtils.passwordOpsLimits.min,
+        passwordMemLimit: keysUtils.passwordMemLimits.min,
+        strictMemoryLock: false,
+      },
       logger,
-      passwordOpsLimit: keysUtils.passwordOpsLimits.min,
-      passwordMemLimit: keysUtils.passwordMemLimits.min,
-      strictMemoryLock: false,
     });
     dbPath = `${dataDir}/db`;
     db = await DB.createDB({

diff --git a/tests/notifications/NotificationsManager.test.ts b/tests/notifications/NotificationsManager.test.ts
@@ -64,10 +64,12 @@ describe('NotificationsManager', () => {
     keyRing = await KeyRing.createKeyRing({
       password,
       keysPath,
+      options: {
+        passwordOpsLimit: keysUtils.passwordOpsLimits.min,
+        passwordMemLimit: keysUtils.passwordMemLimits.min,
+        strictMemoryLock: false,
+      },
       logger,
-      passwordOpsLimit: keysUtils.passwordOpsLimits.min,
-      passwordMemLimit: keysUtils.passwordMemLimits.min,
-      strictMemoryLock: false,
     });
     const dbPath = path.join(dataDir, 'db');
     db = await DB.createDB({

diff --git a/tests/sessions/SessionManager.test.ts b/tests/sessions/SessionManager.test.ts
@@ -30,10 +30,12 @@ describe('SessionManager', () => {
     keyRing = await KeyRing.createKeyRing({
       password,
       keysPath,
+      options: {
+        passwordOpsLimit: keysUtils.passwordOpsLimits.min,
+        passwordMemLimit: keysUtils.passwordMemLimits.min,
+        strictMemoryLock: false,
+      },
       logger,
-      passwordOpsLimit: keysUtils.passwordOpsLimits.min,
-      passwordMemLimit: keysUtils.passwordMemLimits.min,
-      strictMemoryLock: false,
     });
     const dbPath = path.join(dataDir, 'db');
     db = await DB.createDB({

diff --git a/tests/sigchain/Sigchain.test.ts b/tests/sigchain/Sigchain.test.ts
@@ -35,11 +35,13 @@ describe(Sigchain.name, () => {
     keyRing = await KeyRing.createKeyRing({
       keysPath,
       password,
-      privateKey,
+      options: {
+        privateKey,
+        passwordOpsLimit: keysUtils.passwordOpsLimits.min,
+        passwordMemLimit: keysUtils.passwordMemLimits.min,
+        strictMemoryLock: false,
+      },
       logger,
-      passwordOpsLimit: keysUtils.passwordOpsLimits.min,
-      passwordMemLimit: keysUtils.passwordMemLimits.min,
-      strictMemoryLock: false,
     });
     dbPath = `${dataDir}/db`;
     db = await DB.createDB({

diff --git a/tests/utils/tls.ts b/tests/utils/tls.ts
@@ -5,7 +5,7 @@ import type {
   KeyPair,
 } from '@/keys/types';
 import type { TLSConfig } from '@/network/types';
-import type { ClientCrypto, ServerCrypto } from '@matrixai/quic';
+import type { ClientCryptoOps, ServerCryptoOps } from '@matrixai/quic';
 import * as keysUtils from '@/keys/utils';
 import * as testNodesUtils from '../nodes/utils';
 
@@ -63,7 +63,7 @@ async function createTLSConfigWithChain(
   };
 }
 
-function createCrypto(): ServerCrypto & ClientCrypto {
+function createCrypto(): ServerCryptoOps & ClientCryptoOps {
   return {
     randomBytes: async (data: ArrayBuffer) => {
       const randomBytes = keysUtils.getRandomBytes(data.byteLength);