fix: tests

src/client/errors.ts

@@ -19,7 +19,7 @@ class ErrorClientAuthDenied<T> extends ErrorClient<T> {
 }
 
 class ErrorClientInvalidHeader<T> extends ErrorClient<T> {
-  static description = 'The header message does not match the expected type'
+  static description = 'The header message does not match the expected type';
   exitCode = sysexits.USAGE;
 }
 

src/client/handlers/VaultsSecretsRemove.ts

@@ -1,4 +1,5 @@
 import type { DB } from '@matrixai/db';
+import type { ResourceAcquire } from '@matrixai/resources';
 import type {
   ClientRPCRequestParams,
   ClientRPCResponseResult,
@@ -7,9 +8,9 @@ import type {
   SuccessOrErrorMessage,
 } from '../types';
 import type VaultManager from '../../vaults/VaultManager';
-import { ResourceAcquire, withG } from '@matrixai/resources';
+import type { FileSystemWritable } from '../../vaults/types';
+import { withG } from '@matrixai/resources';
 import { DuplexHandler } from '@matrixai/rpc';
-import { FileSystemWritable } from '../../vaults/types';
 import * as vaultsUtils from '../../vaults/utils';
 import * as vaultsErrors from '../../vaults/errors';
 import * as clientErrors from '../errors';

src/client/types.ts

@@ -33,8 +33,7 @@ type JSONRPCResponseResult<
 > = T & {
   metadata?: JSONRPCResponseMetadata &
     M &
-    (T extends { metadata: infer U } ? U : {}) &
-    JSONObject;
+    (T extends { metadata: infer U } ? U : JSONObject);
 };
 
 type ClientRPCRequestParams<T extends JSONObject = JSONObject> =

src/vaults/VaultInternal.ts

@@ -564,7 +564,7 @@ class VaultInternal {
     return async () => {
       let releaseTran: ResourceRelease | undefined = undefined;
       const acquire = this.lock.write();
-      const [release] = await acquire([tran]);
+      const [release] = await acquire();
       if (tran == null) {
         const acquireTran = this.db.transaction();
         [releaseTran, tran] = await acquireTran();
@@ -590,7 +590,7 @@ class VaultInternal {
       );
       return [
         async (e?: Error) => {
-          if (e != null) {
+          if (e == null) {
             try {
               // After doing mutation we need to commit the new history
               await this.createCommit();

tests/client/handlers/vaults.test.ts

@@ -3,8 +3,6 @@ import type { FileSystem } from '@/types';
 import type { VaultId } from '@/ids';
 import type NodeManager from '@/nodes/NodeManager';
 import type {
-  ContentSuccessMessage,
-  ErrorMessage,
   LogEntryMessage,
   SecretContentMessage,
   VaultListMessage,
@@ -75,7 +73,6 @@ import * as vaultsErrors from '@/vaults/errors';
 import * as networkUtils from '@/network/utils';
 import * as utils from '@/utils';
 import * as testsUtils from '../../utils';
-import { error } from 'console';
 
 describe('vaultsClone', () => {
   const logger = new Logger('vaultsClone test', LogLevel.WARN, [
@@ -1731,7 +1728,7 @@ describe('vaultsSecretsCat', () => {
     // Read response
     for await (const data of response.readable) {
       expect(data.type).toEqual('success');
-      if (data.type !== 'success') utils.never()
+      if (data.type !== 'success') utils.never();
       expect(data.secretContent).toEqual(secretContent);
     }
   });
@@ -2530,7 +2527,6 @@ describe('vaultsSecretsRemove', () => {
     // Get log size
     let logLength = 0;
     await vaultManager.withVaults([vaultId], async (vault) => {
-      console.log(await vault.log())
       logLength = (await vault.log()).length;
     });
     // Delete secret
@@ -2557,12 +2553,10 @@ describe('vaultsSecretsRemove', () => {
     for await (const data of response.readable) {
       loopRun = true;
       expect(data.type).toStrictEqual('success');
-      console.log(data.type);
     }
     expect(loopRun).toBeTruthy();
     // Ensure single log message for deleting the secrets
     await vaultManager.withVaults([vaultId], async (vault) => {
-      console.log(await vault.log())
       expect((await vault.log()).length).toEqual(logLength + 1);
     });
   });