wip: fixing up tests

[ci skip]

Author: tegefaulkes

src/nodes/NodeConnectionManager.ts

@@ -1011,7 +1011,7 @@ class NodeConnectionManager {
   public async establishMultiConnection(
     nodeIds: Array<NodeId>,
     addresses: Array<NodeAddress>,
-    connectionTimeout: number = 2000,
+    connectionTimeout: number = 2000, // TODO: apply or remove
     limit: number | undefined,
     @context ctx: ContextTimed,
   ): Promise<Array<NodeId>> {

tests/nodes/NodeConnectionManager.lifecycle.test.ts

@@ -1,30 +1,32 @@
 import type { Host, Port, TLSConfig } from '@/network/types';
-import { webcrypto } from 'crypto';
-import RPCServer from "../../src/rpc/RPCServer";
-import {NodeId, NodeIdEncoded, NodeIdString} from "@/ids";
-import KeyRing from "@/keys/KeyRing";
-import NodeGraph from "@/nodes/NodeGraph";
-import NodeManager from "@/nodes/NodeManager";
-import {DB} from "@matrixai/db";
-import ACL from "@/acl/ACL";
-import GestaltGraph from "@/gestalts/GestaltGraph";
-import path from "path";
-import Sigchain from "@/sigchain/Sigchain";
-import TaskManager from "@/tasks/TaskManager";
-import fs from "fs";
-import os from "os";
-import {QUICServer, QUICSocket} from "@matrixai/quic";
 import type {
   Crypto as QUICCrypto,
   Host as QUICHost,
 } from '@matrixai/quic/dist/types';
+import type { NodeAddress } from '@/nodes/types';
+import type { NodeId, NodeIdEncoded, NodeIdString } from '@/ids';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
+import { webcrypto } from 'crypto';
+import { DB } from '@matrixai/db';
+import { QUICServer, QUICSocket } from '@matrixai/quic';
 import Logger, { formatting, LogLevel, StreamHandler } from '@matrixai/logger';
+import KeyRing from '@/keys/KeyRing';
+import NodeGraph from '@/nodes/NodeGraph';
+import NodeManager from '@/nodes/NodeManager';
+import ACL from '@/acl/ACL';
+import GestaltGraph from '@/gestalts/GestaltGraph';
+import Sigchain from '@/sigchain/Sigchain';
+import TaskManager from '@/tasks/TaskManager';
 import * as nodesUtils from '@/nodes/utils';
 import * as keysUtils from '@/keys/utils';
 import NodeConnectionManager from '@/nodes/NodeConnectionManager';
 import { promise, sleep } from '@/utils';
-import * as tlsUtils from '../utils/tls';
+import * as nodesErrors from '@/nodes/errors';
 import NodeConnection from '../../src/nodes/NodeConnection';
+import RPCServer from '../../src/rpc/RPCServer';
+import * as tlsUtils from '../utils/tls';
 
 /**
  * Signs using the 256-bit HMAC key
@@ -96,6 +98,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
   let serverSocket: QUICSocket;
   let quicServer: QUICServer;
   let rpcServer: RPCServer;
+  let serverAddress: NodeAddress;
   let clientSocket: QUICSocket;
 
   let keyRing: KeyRing;
@@ -207,11 +210,10 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
       db,
       logger,
     });
-    const address = {
+    serverAddress = {
       host: quicServer.host as unknown as Host,
       port: quicServer.port as unknown as Port,
     };
-    await nodeGraph.setNode(serverNodeId, address);
   });
 
   afterEach(async () => {
@@ -273,6 +275,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
   });
 
   test('acquireConnection should create connection', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -313,6 +316,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('withConnF should create connection', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -353,6 +357,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('should list active connections', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -401,6 +406,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('withConnG should create connection', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -436,9 +442,16 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     // @ts-ignore: kidnap protected property
     const connectionMap = nodeConnectionManager.connections;
 
-    await nodeConnectionManager.withConnG(serverNodeId, async function* () {
-      expect(connectionMap.size).toBeGreaterThanOrEqual(1);
-    });
+    const gen = nodeConnectionManager.withConnG(
+      serverNodeId,
+      async function* (): AsyncGenerator {
+        expect(connectionMap.size).toBeGreaterThanOrEqual(1);
+      },
+    );
+
+    for await (const _ of gen) {
+      // Do nothing
+    }
 
     await nodeConnectionManager.stop();
   });
@@ -480,16 +493,26 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     const randomNodeId = keysUtils.publicKeyToNodeId(
       keysUtils.generateKeyPair().publicKey,
     );
-    const gen = nodeConnectionManager.withConnG(randomNodeId, async function* (): AsyncGenerator {
-      expect(connectionMap.size).toBeGreaterThanOrEqual(1);
-    });
-    for await (const _ of gen) {
-      //do nothing
-    }
+    const gen = nodeConnectionManager.withConnG(
+      randomNodeId,
+      async function* (): AsyncGenerator {
+        expect(connectionMap.size).toBeGreaterThanOrEqual(1);
+      },
+    );
+
+    const prom = async () => {
+      for await (const _ of gen) {
+        // Do nothing
+      }
+    };
+    await expect(prom).rejects.toThrow(
+      nodesErrors.ErrorNodeGraphNodeIdNotFound,
+    );
 
     await nodeConnectionManager.stop();
   });
   test('connection should persist', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -536,6 +559,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('should create 1 connection with concurrent creates', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -590,6 +614,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('should destroy a connection', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),
@@ -643,6 +668,7 @@ describe(`${NodeConnectionManager.name} lifecycle test`, () => {
     await nodeConnectionManager.stop();
   });
   test('stopping should destroy all connections', async () => {
+    await nodeGraph.setNode(serverNodeId, serverAddress);
     const nodeConnectionManager = new NodeConnectionManager({
       keyRing,
       logger: logger.getChild(NodeConnectionManager.name),