fix: cleaning up withTransactionF usage

src/acl/ACL.ts

@@ -15,7 +15,6 @@ import {
   CreateDestroyStartStop,
   ready,
 } from '@matrixai/async-init/dist/CreateDestroyStartStop';
-import { withF } from '@matrixai/resources';
 import * as aclUtils from './utils';
 import * as aclErrors from './errors';
 
@@ -91,21 +90,14 @@ class ACL {
     this.logger.info(`Destroyed ${this.constructor.name}`);
   }
 
-  @ready(new aclErrors.ErrorACLNotRunning())
-  public async withTransactionF<T>(
-    f: (tran: DBTransaction) => Promise<T>,
-  ): Promise<T> {
-    return withF([this.db.transaction()], ([tran]) => f(tran));
-  }
-
   @ready(new aclErrors.ErrorACLNotRunning())
   public async sameNodePerm(
     nodeId1: NodeId,
     nodeId2: NodeId,
     tran?: DBTransaction,
   ): Promise<boolean> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.sameNodePerm(nodeId1, nodeId2, tran),
       );
     }
@@ -130,7 +122,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<Array<Record<NodeId, Permission>>> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) => this.getNodePerms(tran));
+      return this.db.withTransactionF((tran) => this.getNodePerms(tran));
     }
     const permIds: Record<PermissionIdString, Record<NodeId, Permission>> = {};
     for await (const [keyPath, value] of tran.iterator([
@@ -171,7 +163,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<Record<VaultId, Record<NodeId, Permission>>> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) => this.getVaultPerms(tran));
+      return this.db.withTransactionF((tran) => this.getVaultPerms(tran));
     }
     const vaultPerms: Record<VaultId, Record<NodeId, Permission>> = {};
     for await (const [keyPath, nodeIds] of tran.iterator<Record<NodeId, null>>(
@@ -226,9 +218,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<Permission | undefined> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
-        this.getNodePerm(nodeId, tran),
-      );
+      return this.db.withTransactionF((tran) => this.getNodePerm(nodeId, tran));
     }
     const permId = await tran.get(
       [...this.aclNodesDbPath, nodeId.toBuffer()],
@@ -255,7 +245,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<Record<NodeId, Permission>> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.getVaultPerm(vaultId, tran),
       );
     }
@@ -311,7 +301,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.setNodeAction(nodeId, action, tran),
       );
     }
@@ -357,7 +347,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.unsetNodeAction(nodeId, action, tran),
       );
     }
@@ -384,7 +374,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.setVaultAction(vaultId, nodeId, action, tran),
       );
     }
@@ -428,7 +418,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.unsetVaultAction(vaultId, nodeId, action, tran),
       );
     }
@@ -470,7 +460,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.setNodesPerm(nodeIds, perm, tran),
       );
     }
@@ -525,7 +515,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.setNodePerm(nodeId, perm, tran),
       );
     }
@@ -566,7 +556,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.unsetNodePerm(nodeId, tran),
       );
     }
@@ -598,7 +588,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.unsetVaultPerms(vaultId, tran),
       );
     }
@@ -638,7 +628,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.joinNodePerm(nodeId, nodeIdsJoin, perm, tran),
       );
     }
@@ -694,7 +684,7 @@ class ACL {
     tran?: DBTransaction,
   ): Promise<void> {
     if (tran == null) {
-      return this.withTransactionF(async (tran) =>
+      return this.db.withTransactionF((tran) =>
         this.joinVaultPerms(vaultId, vaultIdsJoin, tran),
       );
     }

src/agent/service/nodesChainDataGet.ts

@@ -26,7 +26,7 @@ function nodesChainDataGet({
   ): Promise<void> => {
     try {
       const response = new nodesPB.ChainData();
-      const chainData = await db.withTransactionF(async (tran) =>
+      const chainData = await db.withTransactionF((tran) =>
         sigchain.getChainData(tran),
       );
       // Iterate through each claim in the chain, and serialize for transport

src/agent/service/nodesClosestLocalNodesGet.ts

@@ -46,9 +46,8 @@ function nodesClosestLocalNodesGet({
         },
       );
       // Get all local nodes that are closest to the target node from the request
-      const closestNodes = await db.withTransactionF(
-        async (tran) =>
-          await nodeGraph.getClosestNodes(nodeId, undefined, tran),
+      const closestNodes = await db.withTransactionF((tran) =>
+        nodeGraph.getClosestNodes(nodeId, undefined, tran),
       );
       for (const [nodeId, nodeData] of closestNodes) {
         const addressMessage = new nodesPB.Address();

src/agent/service/nodesCrossSignClaim.ts

@@ -39,7 +39,7 @@ function nodesCrossSignClaim({
       true,
     );
     try {
-      await db.withTransactionF(async (tran) => {
+      await db.withTransactionF((tran) => {
         const readStatus = await genClaims.read();
         // If nothing to read, end and destroy
         if (readStatus.done) {

src/agent/service/nodesHolePunchMessageSend.ts

@@ -58,7 +58,7 @@ function nodesHolePunchMessageSend({
       // Firstly, check if this node is the desired node
       // If so, then we want to make this node start sending hole punching packets
       // back to the source node.
-      await db.withTransactionF(async (tran) => {
+      await db.withTransactionF((tran) => {
         if (keyManager.getNodeId().equals(targetId)) {
           const [host, port] = networkUtils.parseAddress(
             call.request.getProxyAddress(),

src/agent/service/notificationsSend.ts

@@ -28,9 +28,9 @@ function notificationsSend({
     try {
       const jwt = call.request.getContent();
       const notification = await notificationsUtils.verifyAndDecodeNotif(jwt);
-      await db.withTransactionF(async (tran) => {
-        await notificationsManager.receiveNotification(notification, tran);
-      });
+      await db.withTransactionF((tran) =>
+        notificationsManager.receiveNotification(notification, tran),
+      );
       const response = new utilsPB.EmptyMessage();
       callback(null, response);
       return;

src/agent/service/vaultsGitInfoGet.ts

@@ -34,7 +34,7 @@ function vaultsGitInfoGet({
   ): Promise<void> => {
     const genWritable = grpcUtils.generatorWritable(call, true);
     try {
-      await db.withTransactionF(async (tran) => {
+      await db.withTransactionF((tran) => {
         const vaultIdFromName = await vaultManager.getVaultId(
           call.request.getVault()?.getNameOrId() as VaultName,
           tran,

src/agent/service/vaultsGitPackGet.ts

@@ -57,7 +57,7 @@ function vaultsGitPackGet({
       const nodeId = connectionInfo.remoteNodeId;
       const nodeIdEncoded = nodesUtils.encodeNodeId(nodeId);
       const nameOrId = meta.get('vaultNameOrId').pop()!.toString();
-      await db.withTransactionF(async (tran) => {
+      await db.withTransactionF((tran) => {
         const vaultIdFromName = await vaultManager.getVaultId(
           nameOrId as VaultName,
           tran,

src/agent/service/vaultsScan.ts

@@ -36,7 +36,7 @@ function vaultsScan({
     }
     const nodeId = connectionInfo.remoteNodeId;
     try {
-      await db.withTransactionF(async (tran) => {
+      await db.withTransactionF((tran) => {
         const listResponse = vaultManager.handleScanVaults(nodeId, tran);
         for await (const {
           vaultId,

src/client/service/agentLockAll.ts

@@ -26,9 +26,7 @@ function agentLockAll({
       const response = new utilsPB.EmptyMessage();
       const metadata = await authenticate(call.metadata);
       call.sendMetadata(metadata);
-      await db.withTransactionF(
-        async (tran) => await sessionManager.resetKey(tran),
-      );
+      await db.withTransactionF((tran) => sessionManager.resetKey(tran));
       callback(null, response);
       return;
     } catch (e) {

src/client/service/gestaltsActionsGetByIdentity.ts

@@ -48,7 +48,7 @@ function gestaltsActionsGetByIdentity({
         },
       );
 
-      const result = await db.withTransactionF(async (tran) =>
+      const result = await db.withTransactionF((tran) =>
         gestaltGraph.getGestaltActionsByIdentity(providerId, identityId, tran),
       );
       if (result == null) {

src/client/service/gestaltsActionsGetByNode.ts

@@ -42,7 +42,7 @@ function gestaltsActionsGetByNode({
           nodeId: call.request.getNodeId(),
         },
       );
-      const result = await db.withTransactionF(async (tran) =>
+      const result = await db.withTransactionF((tran) =>
         gestaltGraph.getGestaltActionsByNode(nodeId, tran),
       );
       if (result == null) {

src/client/service/gestaltsActionsSetByIdentity.ts

@@ -56,7 +56,7 @@ function gestaltsActionsSetByIdentity({
           identityId: call.request.getIdentity()?.getIdentityId(),
         },
       );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         gestaltGraph.setGestaltActionByIdentity(
           providerId,
           identityId,

src/client/service/gestaltsActionsSetByNode.ts

@@ -47,7 +47,7 @@ function gestaltsActionsSetByNode({
             action: call.request.getAction(),
           },
         );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         gestaltGraph.setGestaltActionByNode(nodeId, action, tran),
       );
       callback(null, response);

src/client/service/gestaltsActionsUnsetByIdentity.ts

@@ -56,7 +56,7 @@ function gestaltsActionsUnsetByIdentity({
           identityId: call.request.getIdentity()?.getIdentityId(),
         },
       );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         gestaltGraph.unsetGestaltActionByIdentity(
           providerId,
           identityId,

src/client/service/gestaltsActionsUnsetByNode.ts

@@ -47,7 +47,7 @@ function gestaltsActionsUnsetByNode({
             action: call.request.getAction(),
           },
         );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         gestaltGraph.unsetGestaltActionByNode(nodeId, action, tran),
       );
       callback(null, response);

src/client/service/gestaltsGestaltGetByIdentity.ts

@@ -50,7 +50,7 @@ function gestaltsGestaltGetByIdentity({
           identityId: call.request.getIdentityId(),
         },
       );
-      const gestalt = await db.withTransactionF(async (tran) =>
+      const gestalt = await db.withTransactionF((tran) =>
         gestaltGraph.getGestaltByIdentity(providerId, identityId, tran),
       );
       if (gestalt != null) {

src/client/service/gestaltsGestaltGetByNode.ts

@@ -46,7 +46,7 @@ function gestaltsGestaltGetByNode({
           nodeId: call.request.getNodeId(),
         },
       );
-      const gestalt = await db.withTransactionF(async (tran) =>
+      const gestalt = await db.withTransactionF((tran) =>
         gestaltGraph.getGestaltByNode(nodeId, tran),
       );
       if (gestalt != null) {

src/client/service/gestaltsGestaltList.ts

@@ -28,7 +28,7 @@ function gestaltsGestaltList({
     try {
       const metadata = await authenticate(call.metadata);
       call.sendMetadata(metadata);
-      const certs: Array<Gestalt> = await db.withTransactionF(async (tran) =>
+      const certs: Array<Gestalt> = await db.withTransactionF((tran) =>
         gestaltGraph.getGestalts(tran),
       );
       for (const cert of certs) {

src/client/service/identitiesClaim.ts

@@ -71,7 +71,7 @@ function identitiesClaim({
         throw new identitiesErrors.ErrorProviderUnauthenticated();
       }
       // Create identity claim on our node
-      const [, claim] = await db.withTransactionF(async (tran) =>
+      const [, claim] = await db.withTransactionF((tran) =>
         sigchain.addClaim(
           {
             type: 'identity',

src/client/service/identitiesTokenDelete.ts

@@ -50,7 +50,7 @@ function identitiesTokenDelete({
           identityId: call.request.getIdentityId(),
         },
       );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         identitiesManager.delToken(providerId, identityId, tran),
       );
       callback(null, response);

src/client/service/identitiesTokenGet.ts

@@ -49,7 +49,7 @@ function identitiesTokenGet({
           identityId: call.request.getIdentityId(),
         },
       );
-      const tokens = await db.withTransactionF(async (tran) =>
+      const tokens = await db.withTransactionF((tran) =>
         identitiesManager.getToken(providerId, identityId, tran),
       );
       response.setToken(JSON.stringify(tokens));

src/client/service/identitiesTokenPut.ts

@@ -53,7 +53,7 @@ function identitiesTokenPut({
           identityId: call.request.getProvider()?.getIdentityId(),
         },
       );
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         identitiesManager.putToken(
           providerId,
           identityId,

src/client/service/nodesAdd.ts

@@ -72,7 +72,7 @@ function nodesAdd({
         );
       }
 
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         nodeManager.setNode(
           nodeId,
           {

src/client/service/notificationsClear.ts

@@ -26,7 +26,7 @@ function notificationsClear({
       const response = new utilsPB.EmptyMessage();
       const metadata = await authenticate(call.metadata);
       call.sendMetadata(metadata);
-      await db.withTransactionF(async (tran) =>
+      await db.withTransactionF((tran) =>
         notificationsManager.clearNotifications(tran),
       );
       callback(null, response);

src/client/service/notificationsRead.ts

@@ -35,7 +35,7 @@ function notificationsRead({
       } else {
         number = parseInt(numberField);
       }
-      const notifications = await db.withTransactionF(async (tran) =>
+      const notifications = await db.withTransactionF((tran) =>
         notificationsManager.readNotifications({
           unread,
           number,