wip: fixes

[ci skip]

Author: tegefaulkes

src/PolykeyClient.ts

@@ -24,7 +24,7 @@ interface PolykeyClient extends CreateDestroyStartStop {}
 )
 class PolykeyClient {
   static async createPolykeyClient({
-    nodePath = config.defaults.nodePath,
+    nodePath = config.defaultsUser.nodePath,
     session,
     rpcClientClient,
     streamFactory,

src/bootstrap/utils.ts

@@ -4,7 +4,6 @@ import type { PasswordMemLimit, PasswordOpsLimit } from '../keys/types';
 import path from 'path';
 import Logger from '@matrixai/logger';
 import { DB } from '@matrixai/db';
-import { CertManager } from '@/keys';
 import * as bootstrapErrors from './errors';
 import TaskManager from '../tasks/TaskManager';
 import { IdentitiesManager } from '../identities';
@@ -14,7 +13,7 @@ import { Schema } from '../schema';
 import { Sigchain } from '../sigchain';
 import { ACL } from '../acl';
 import { GestaltGraph } from '../gestalts';
-import { KeyRing } from '../keys';
+import { KeyRing, CertManager } from '../keys';
 import { NodeGraph, NodeManager } from '../nodes';
 import { VaultManager } from '../vaults';
 import { NotificationsManager } from '../notifications';

src/utils/utils.ts

@@ -118,11 +118,7 @@ function filterEmptyObject(o) {
   ]);
 }
 
-function filterObject<
-  T extends Record<K, V>,
-  K extends string,
-  V extends unknown,
->(
+function filterObject<T extends Record<K, V>, K extends string, V>(
   obj: T,
   f: (element: [K, V], index: number, arr: Array<[K, V]>) => boolean,
 ): Partial<T> {

src/validation/utils.ts

@@ -234,14 +234,14 @@ function parsePort(data: any, connect: boolean = false): Port {
 }
 
 function parseNetwork(data: any): SeedNodes {
-  if (typeof data !== 'string' || !(data in config.defaults.network)) {
+  if (typeof data !== 'string' || !(data in config.network)) {
     throw new validationErrors.ErrorParse(
-      `Network must be one of ${Object.keys(config.defaults.network).join(
+      `Network must be one of ${Object.keys(config.network).join(
         ', ',
       )}`,
     );
   }
-  return config.defaults.network[data];
+  return config.network[data];
 }
 
 /**