wallet-core: simplify/unify DB access

1 files changed, 68 insertions, 75 deletions

diff --git a/packages/taler-wallet-core/src/operations/pay-peer-common.ts b/packages/taler-wallet-core/src/operations/pay-peer-common.ts
index 88eedb530..ae6f98ccd 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-common.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-common.ts
@@ -30,11 +30,7 @@ import {
   codecOptional,
 } from "@gnu-taler/taler-util";
 import { SpendCoinDetails } from "../crypto/cryptoImplementation.js";
-import {
-  DenominationRecord,
-  PeerPushPaymentCoinSelection,
-  ReserveRecord,
-} from "../db.js";
+import { PeerPushPaymentCoinSelection, ReserveRecord } from "../db.js";
 import { InternalWalletState } from "../internal-wallet-state.js";
 import type { SelectedPeerCoin } from "../util/coinSelection.js";
 import { checkDbInvariant } from "../util/invariants.js";
@@ -51,33 +47,31 @@ export async function queryCoinInfosForSelection(
   csel: PeerPushPaymentCoinSelection,
 ): Promise<SpendCoinDetails[]> {
   let infos: SpendCoinDetails[] = [];
-  await ws.db
-    .mktx((x) => [x.coins, x.denominations])
-    .runReadOnly(async (tx) => {
-      for (let i = 0; i < csel.coinPubs.length; i++) {
-        const coin = await tx.coins.get(csel.coinPubs[i]);
-        if (!coin) {
-          throw Error("coin not found anymore");
-        }
-        const denom = await ws.getDenomInfo(
-          ws,
-          tx,
-          coin.exchangeBaseUrl,
-          coin.denomPubHash,
-        );
-        if (!denom) {
-          throw Error("denom for coin not found anymore");
-        }
-        infos.push({
-          coinPriv: coin.coinPriv,
-          coinPub: coin.coinPub,
-          denomPubHash: coin.denomPubHash,
-          denomSig: coin.denomSig,
-          ageCommitmentProof: coin.ageCommitmentProof,
-          contribution: csel.contributions[i],
-        });
+  await ws.db.runReadOnlyTx(["coins", "denominations"], async (tx) => {
+    for (let i = 0; i < csel.coinPubs.length; i++) {
+      const coin = await tx.coins.get(csel.coinPubs[i]);
+      if (!coin) {
+        throw Error("coin not found anymore");
+      }
+      const denom = await ws.getDenomInfo(
+        ws,
+        tx,
+        coin.exchangeBaseUrl,
+        coin.denomPubHash,
+      );
+      if (!denom) {
+        throw Error("denom for coin not found anymore");
       }
-    });
+      infos.push({
+        coinPriv: coin.coinPriv,
+        coinPub: coin.coinPub,
+        denomPubHash: coin.denomPubHash,
+        denomSig: coin.denomSig,
+        ageCommitmentProof: coin.ageCommitmentProof,
+        contribution: csel.contributions[i],
+      });
+    }
+  });
   return infos;
 }
 
@@ -86,48 +80,46 @@ export async function getTotalPeerPaymentCost(
   pcs: SelectedPeerCoin[],
 ): Promise<AmountJson> {
   const currency = Amounts.currencyOf(pcs[0].contribution);
-  return ws.db
-    .mktx((x) => [x.coins, x.denominations])
-    .runReadOnly(async (tx) => {
-      const costs: AmountJson[] = [];
-      for (let i = 0; i < pcs.length; i++) {
-        const coin = await tx.coins.get(pcs[i].coinPub);
-        if (!coin) {
-          throw Error("can't calculate payment cost, coin not found");
-        }
-        const denomInfo = await ws.getDenomInfo(
-          ws,
-          tx,
-          coin.exchangeBaseUrl,
-          coin.denomPubHash,
-        );
-        if (!denomInfo) {
-          throw Error(
-            "can't calculate payment cost, denomination for coin not found",
-          );
-        }
-        const allDenoms = await getCandidateWithdrawalDenomsTx(
-          ws,
-          tx,
-          coin.exchangeBaseUrl,
-          currency,
-        );
-        const amountLeft = Amounts.sub(
-          denomInfo.value,
-          pcs[i].contribution,
-        ).amount;
-        const refreshCost = getTotalRefreshCost(
-          allDenoms,
-          denomInfo,
-          amountLeft,
-          ws.config.testing.denomselAllowLate,
+  return ws.db.runReadOnlyTx(["coins", "denominations"], async (tx) => {
+    const costs: AmountJson[] = [];
+    for (let i = 0; i < pcs.length; i++) {
+      const coin = await tx.coins.get(pcs[i].coinPub);
+      if (!coin) {
+        throw Error("can't calculate payment cost, coin not found");
+      }
+      const denomInfo = await ws.getDenomInfo(
+        ws,
+        tx,
+        coin.exchangeBaseUrl,
+        coin.denomPubHash,
+      );
+      if (!denomInfo) {
+        throw Error(
+          "can't calculate payment cost, denomination for coin not found",
         );
-        costs.push(Amounts.parseOrThrow(pcs[i].contribution));
-        costs.push(refreshCost);
       }
-      const zero = Amounts.zeroOfAmount(pcs[0].contribution);
-      return Amounts.sum([zero, ...costs]).amount;
-    });
+      const allDenoms = await getCandidateWithdrawalDenomsTx(
+        ws,
+        tx,
+        coin.exchangeBaseUrl,
+        currency,
+      );
+      const amountLeft = Amounts.sub(
+        denomInfo.value,
+        pcs[i].contribution,
+      ).amount;
+      const refreshCost = getTotalRefreshCost(
+        allDenoms,
+        denomInfo,
+        amountLeft,
+        ws.config.testing.denomselAllowLate,
+      );
+      costs.push(Amounts.parseOrThrow(pcs[i].contribution));
+      costs.push(refreshCost);
+    }
+    const zero = Amounts.zeroOfAmount(pcs[0].contribution);
+    return Amounts.sum([zero, ...costs]).amount;
+  });
 }
 
 interface ExchangePurseStatus {
@@ -153,9 +145,9 @@ export async function getMergeReserveInfo(
   // due to the async crypto API.
   const newReservePair = await ws.cryptoApi.createEddsaKeypair({});
 
-  const mergeReserveRecord: ReserveRecord = await ws.db
-    .mktx((x) => [x.exchanges, x.reserves, x.withdrawalGroups])
-    .runReadWrite(async (tx) => {
+  const mergeReserveRecord: ReserveRecord = await ws.db.runReadWriteTx(
+    ["exchanges", "reserves"],
+    async (tx) => {
       const ex = await tx.exchanges.get(req.exchangeBaseUrl);
       checkDbInvariant(!!ex);
       if (ex.currentMergeReserveRowId != null) {
@@ -173,7 +165,8 @@ export async function getMergeReserveInfo(
       ex.currentMergeReserveRowId = reserve.rowId;
       await tx.exchanges.put(ex);
       return reserve;
-    });
+    },
+  );
 
   return mergeReserveRecord;
 }