tests: test fixes

Author: tegefaulkes

src/config.ts

@@ -1,8 +1,30 @@
 import type { Host, Port } from './network/types';
+import type { NodeAddress } from 'nodes/types';
 import { getDefaultNodePath } from './utils';
 // @ts-ignore package.json is outside rootDir
 import { version } from '../package.json';
 
+/**
+ * Configuration for testnet node addresses.
+ * Extracted here to enforce types properly.
+ */
+const testnet: Record<string, NodeAddress> = {
+  vg9a9e957878s2qgtbdmu2atvli8ms7muukb1dk4dpbm4llkki3h0: {
+    host: 'testnet.polykey.io' as Host,
+    port: 1314 as Port,
+  },
+  vh9oqtvct10eaiv3cl4ebm0ko33sl0qqpvb59vud8cngfvqs4p4ng: {
+    host: 'testnet.polykey.io' as Host,
+    port: 1314 as Port,
+  },
+};
+
+/**
+ * Configuration for main net node addresses.
+ * Extracted here to enforce types properly.
+ */
+const mainnet: Record<string, NodeAddress> = {};
+
 /**
  * Polykey static configuration
  * This is intended only for static properties
@@ -96,17 +118,8 @@ const config = {
     },
     // This is not used by the `PolykeyAgent` which defaults to `{}`
     network: {
-      mainnet: {},
-      testnet: {
-        vg9a9e957878s2qgtbdmu2atvli8ms7muukb1dk4dpbm4llkki3h0: {
-          host: 'testnet.polykey.io' as Host,
-          port: 1314 as Port,
-        },
-        vh9oqtvct10eaiv3cl4ebm0ko33sl0qqpvb59vud8cngfvqs4p4ng: {
-          host: 'testnet.polykey.io' as Host,
-          port: 1314 as Port,
-        },
-      },
+      mainnet: mainnet,
+      testnet: testnet,
     },
   },
 };

src/nodes/NodeConnectionManager.ts

@@ -829,9 +829,7 @@ class NodeConnectionManager {
       this.keyManager.getNodeId().equals(targetNodeId)
     ) {
       // Logging and silently dropping operation
-      this.logger.warn(
-        'Attempted to send signaling message to our own NodeId',
-      );
+      this.logger.warn('Attempted to send signaling message to our own NodeId');
       return;
     }
     const rlyNode = nodesUtils.encodeNodeId(relayNodeId);

tests/bin/agent/start.test.ts

@@ -517,7 +517,7 @@ describe('start', () => {
           // This line is brittle
           // It may change if the log format changes
           // Make sure to keep it updated at the exact point when the DB is created
-          if (l === 'INFO:DB:Created DB') {
+          if (l === 'INFO:polykey.PolykeyAgent.DB:Created DB') {
             agentProcess1.kill('SIGINT');
             resolve();
           }

tests/bin/bootstrap.test.ts

@@ -279,7 +279,7 @@ describe('bootstrap', () => {
           // This line is brittle
           // It may change if the log format changes
           // Make sure to keep it updated at the exact point when the root key pair is generated
-          if (l === 'INFO:KeyManager:Generating root key pair') {
+          if (l === 'INFO:polykey.KeyManager:Generating root key pair') {
             bootstrapProcess1.kill('SIGINT');
             resolve();
           }

tests/bin/polykey.test.ts

@@ -64,7 +64,7 @@ describe('polykey', () => {
     const stderrParsed = JSON.parse(stderrStart);
     expect(stderrParsed).toMatchObject({
       level: expect.stringMatching(/INFO|WARN|ERROR|DEBUG/),
-      key: expect.any(String),
+      keys: expect.any(String),
       msg: expect.any(String),
     });
     agentProcess.kill('SIGTERM');