wip: fixing up tests

[ci skip]

Author: tegefaulkes

src/nodes/NodeConnection.ts

@@ -12,7 +12,6 @@ import { CreateDestroy } from '@matrixai/async-init/dist/CreateDestroy';
 import { timedCancellable, context } from '@matrixai/contexts/dist/decorators';
 import { Evented } from '@matrixai/events';
 import { QUICClient, events as quicEvents } from '@matrixai/quic';
-import { QUICClientEvent } from '@matrixai/quic/dist/events';
 import * as nodesErrors from './errors';
 import * as nodesEvents from './events';
 import RPCClient from '../rpc/RPCClient';

src/nodes/NodeConnectionManager.ts

@@ -281,7 +281,7 @@ class NodeConnectionManager {
   }
 
   public async start({
-    host = '::' as Host,
+    host = '::' as Host, // FIXME: Should just be string and number
     port = 0 as Port,
     reuseAddr = false,
     ipv6Only = false,

src/nodes/NodeManager.ts

@@ -199,7 +199,7 @@ class NodeManager {
   handleNodeConnectionEvent = (
     e: nodesEvents.EventNodeConnectionManagerConnection,
   ) => {
-    this.setNode(
+    void this.setNode(
       e.detail.remoteNodeId,
       {
         host: e.detail.remoteHost,

src/nodes/events.ts

@@ -1,5 +1,5 @@
 import type { QUICStream } from '@matrixai/quic';
-import type { ConnectionData } from '@/network/types';
+import type { ConnectionData } from '../network/types';
 import { AbstractEvent } from '@matrixai/events';
 
 abstract class EventsNode<T> extends AbstractEvent<T> {}

tests/agent/handlers/nodesClaimsGet.test.ts

@@ -1,7 +1,6 @@
 import type { IdentityId, ProviderId } from '@/identities/types';
 import type { ClaimIdEncoded } from '@/ids';
 import type * as quicEvents from '@matrixai/quic/dist/events';
-import type { Host as QUICHost } from '@matrixai/quic';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
@@ -26,7 +25,7 @@ describe('nodesClaimsGet', () => {
   ]);
   const password = 'password';
   const crypto = tlsTestsUtils.createCrypto();
-  const localHost = '127.0.0.1' as QUICHost;
+  const localHost = '127.0.0.1';
 
   let dataDir: string;
 

tests/agent/handlers/nodesClosestLocalNode.test.ts

@@ -1,5 +1,4 @@
 import type * as quicEvents from '@matrixai/quic/dist/events';
-import type { Host as QUICHost } from '@matrixai/quic';
 import type { NodeIdEncoded } from '@/ids';
 import type { Host, Port } from '@/network/types';
 import fs from 'fs';
@@ -25,7 +24,7 @@ describe('nodesClosestLocalNode', () => {
   ]);
   const password = 'password';
   const crypto = tlsTestsUtils.createCrypto();
-  const localHost = '127.0.0.1' as QUICHost;
+  const localHost = '127.0.0.1';
 
   let dataDir: string;
 

tests/agent/handlers/nodesCrossSignClaim.test.ts

@@ -1,5 +1,4 @@
 import type * as quicEvents from '@matrixai/quic/dist/events';
-import type { Host as QUICHost } from '@matrixai/quic';
 import type NodeConnectionManager from '@/nodes/NodeConnectionManager';
 import type { AgentClaimMessage } from '@/agent/handlers/types';
 import type { NodeId } from '@/ids';
@@ -35,7 +34,7 @@ describe('nodesCrossSignClaim', () => {
   ]);
   const password = 'password';
   const crypto = tlsTestsUtils.createCrypto();
-  const localHost = '127.0.0.1' as QUICHost;
+  const localHost = '127.0.0.1';
 
   let dataDir: string;
 

tests/agent/handlers/nodesHolePunchMessage.test.ts

@@ -1,5 +1,4 @@
 import type * as quicEvents from '@matrixai/quic/dist/events';
-import type { Host as QUICHost } from '@matrixai/quic';
 import type GestaltGraph from '../../../src/gestalts/GestaltGraph';
 import fs from 'fs';
 import path from 'path';
@@ -28,7 +27,7 @@ describe('nodesHolePunchMessage', () => {
   ]);
   const password = 'password';
   const crypto = tlsTestsUtils.createCrypto();
-  const localHost = '127.0.0.1' as QUICHost;
+  const localHost = '127.0.0.1';
 
   let dataDir: string;
 

tests/agent/handlers/notificationsSend.test.ts

@@ -1,13 +1,13 @@
 import type * as quicEvents from '@matrixai/quic/dist/events';
-import type { Host as QUICHost } from '@matrixai/quic';
 import type { Notification, SignedNotification } from '@/notifications/types';
 import type { NodeId } from '@/ids';
 import type GestaltGraph from '../../../src/gestalts/GestaltGraph';
+import type { Host } from '@/network/types';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
-import { QUICClient, QUICServer, QUICSocket } from '@matrixai/quic';
+import { QUICClient, QUICServer } from '@matrixai/quic';
 import { DB } from '@matrixai/db';
 import RPCClient from '@/rpc/RPCClient';
 import RPCServer from '@/rpc/RPCServer';
@@ -36,7 +36,7 @@ describe('notificationsSend', () => {
   ]);
   const password = 'password';
   const crypto = tlsTestsUtils.createCrypto();
-  const localHost = '127.0.0.1' as QUICHost;
+  const localHost = '127.0.0.1' as Host;
 
   let dataDir: string;
 
@@ -46,7 +46,6 @@ describe('notificationsSend', () => {
   let acl: ACL;
   let sigchain: Sigchain;
   let taskManager: TaskManager;
-  let quicSocket: QUICSocket;
   let nodeConnectionManager: NodeConnectionManager;
   let nodeManager: NodeManager;
   let notificationsManager: NotificationsManager;
@@ -118,23 +117,15 @@ describe('notificationsSend', () => {
       logger,
       lazy: true,
     });
-    quicSocket = new QUICSocket({
-      logger,
-    });
-    await quicSocket.start({
-      host: localHost,
-    });
     const tlsConfigClient = await tlsTestsUtils.createTLSConfig(
       keyRing.keyPair,
     );
     nodeConnectionManager = new NodeConnectionManager({
       tlsConfig: tlsConfigClient,
-      crypto,
-      quicSocket,
       keyRing,
       nodeGraph,
-      connectionConnectTime: 2000,
-      connectionTimeoutTime: 2000,
+      connectionConnectTimeoutTime: 2000,
+      connectionIdleTimeoutTime: 2000,
       logger: logger.getChild('NodeConnectionManager'),
     });
     nodeManager = new NodeManager({
@@ -148,7 +139,7 @@ describe('notificationsSend', () => {
       logger,
     });
     await nodeManager.start();
-    await nodeConnectionManager.start({ nodeManager, handleStream: () => {} });
+    await nodeConnectionManager.start({ host: localHost });
     await taskManager.startProcessing();
     notificationsManager =
       await NotificationsManager.createNotificationsManager({
@@ -253,7 +244,6 @@ describe('notificationsSend', () => {
     await notificationsManager.stop();
     await nodeManager.stop();
     await nodeConnectionManager.stop();
-    await quicSocket.stop();
     await sigchain.stop();
     await acl.stop();
     await nodeGraph.stop();