fix: client tests had to be updated with new client domain

src/client/callers/notificationsSend.ts

@@ -1,5 +1,5 @@
 import type { HandlerTypes } from '@matrixai/rpc';
-import type NotificationsSend from '../handlers/NotificationsRead';
+import type NotificationsSend from '../handlers/NotificationsSend';
 import { UnaryCaller } from '@matrixai/rpc';
 
 type CallerTypes = HandlerTypes<NotificationsSend>;

src/client/handlers/KeysPublicKey.ts

@@ -1,7 +1,6 @@
 import type {
   ClientRPCRequestParams,
   ClientRPCResponseResult,
-  PasswordMessage,
   PublicKeyMessage,
 } from '../types';
 import type KeyRing from '../../keys/KeyRing';
@@ -12,7 +11,7 @@ class KeysPublicKey extends UnaryHandler<
   {
     keyRing: KeyRing;
   },
-  ClientRPCRequestParams<PasswordMessage>,
+  ClientRPCRequestParams,
   ClientRPCResponseResult<PublicKeyMessage>
 > {
   public handle = async (): Promise<

src/client/utils.ts

@@ -6,8 +6,8 @@ import type KeyRing from '../keys/KeyRing';
 import type { Certificate, CertificatePEM } from '../keys/types';
 import type { NodeId } from '../ids';
 import { utils as wsUtils } from '@matrixai/ws';
-import * as keysUtils from '../keys/utils';
 import * as clientErrors from './errors';
+import * as keysUtils from '../keys/utils';
 
 async function authenticate(
   sessionManager: SessionManager,

tests/client/ClientService.test.ts

@@ -2,7 +2,7 @@ import type { TLSConfig } from '@/network/types';
 import Logger, { formatting, LogLevel, StreamHandler } from '@matrixai/logger';
 import ClientService from '@/client/ClientService';
 import * as keysUtils from '@/keys/utils';
-import * as utils from '../utils';
+import * as testsUtils from '../utils';
 
 describe(`ClientService tests`, () => {
   const logger = new Logger(`${ClientService.name} test`, LogLevel.WARN, [
@@ -11,32 +11,25 @@ describe(`ClientService tests`, () => {
     ),
   ]);
   const localHost = '127.0.0.1';
-
   let clientService: ClientService;
   let tlsConfig: TLSConfig;
-
   beforeEach(async () => {
-    tlsConfig = await utils.createTLSConfig(keysUtils.generateKeyPair());
+    tlsConfig = await testsUtils.createTLSConfig(keysUtils.generateKeyPair());
   });
   afterEach(async () => {
     await clientService?.stop({ force: true });
   });
-
   test('ClientService readiness', async () => {
-    clientService = await ClientService.createClientService({
-      manifest: {},
-      options: {
-        host: localHost,
-      },
+    clientService = new ClientService({
       tlsConfig,
-      logger,
+      logger: logger.getChild(ClientService.name),
+    });
+    await clientService.start({
+      manifest: {},
+      host: localHost,
     });
     await clientService.stop({ force: true });
     // Should be a noop
     await clientService.stop({ force: true });
-    await clientService.destroy();
-    // Should be a noop
-    await clientService.destroy();
   });
-  // TODO: tests?
 });

tests/client/authenticationMiddleware.test.ts

@@ -16,13 +16,13 @@ import {
 } from '@matrixai/rpc';
 import { WebSocketClient } from '@matrixai/ws';
 import KeyRing from '@/keys/KeyRing';
-import * as keysUtils from '@/keys/utils';
 import TaskManager from '@/tasks/TaskManager';
 import CertManager from '@/keys/CertManager';
+import ClientService from '@/client/ClientService';
 import { Session, SessionManager } from '@/sessions';
+import * as authMiddleware from '@/client/authenticationMiddleware';
+import * as keysUtils from '@/keys/utils';
 import * as clientUtils from '@/client/utils';
-import * as authMiddleware from '@/client/utils/authenticationMiddleware';
-import ClientService from '@/client/ClientService';
 import * as networkUtils from '@/network/utils';
 import * as testsUtils from '../utils';
 
@@ -107,19 +107,19 @@ describe('authenticationMiddleware', () => {
         return input;
       }
     }
-    clientService = await ClientService.createClientService({
+    clientService = new ClientService({
       tlsConfig,
+      middlewareFactory: authMiddleware.authenticationMiddlewareServer(
+        sessionManager,
+        keyRing,
+      ),
+      logger: logger.getChild(ClientService.name),
+    });
+    await clientService.start({
       manifest: {
         testHandler: new EchoHandler({ logger }),
       },
-      options: {
-        host: localhost,
-        middlewareFactory: authMiddleware.authenticationMiddlewareServer(
-          sessionManager,
-          keyRing,
-        ),
-      },
-      logger: logger.getChild(ClientService.name),
+      host: localhost,
     });
     clientClient = await WebSocketClient.createWebSocketClient({
       config: {