From 4898f50db777a68cd2ddd0c1e323ef55033f4af7 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 8 Sep 2023 13:33:21 +0200
Subject: wallet-core: more DB cleanup

---
 .../taler-wallet-core/src/util/coinSelection.ts    | 30 +++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'packages/taler-wallet-core/src/util/coinSelection.ts')

diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts
index ce9fec186..ef2f85789 100644
--- a/packages/taler-wallet-core/src/util/coinSelection.ts
+++ b/packages/taler-wallet-core/src/util/coinSelection.ts
@@ -699,25 +699,17 @@ export function selectWithdrawalDenominations(
   let totalWithdrawCost = Amounts.zeroOfCurrency(amountAvailable.currency);
 
   denoms = denoms.filter((d) => isWithdrawableDenom(d, denomselAllowLate));
-  denoms.sort((d1, d2) =>
-    Amounts.cmp(
-      DenominationRecord.getValue(d2),
-      DenominationRecord.getValue(d1),
-    ),
-  );
+  denoms.sort((d1, d2) => Amounts.cmp(d2.value, d1.value));
 
   for (const d of denoms) {
-    const cost = Amounts.add(
-      DenominationRecord.getValue(d),
-      d.fees.feeWithdraw,
-    ).amount;
+    const cost = Amounts.add(d.value, d.fees.feeWithdraw).amount;
     const res = Amounts.divmod(remaining, cost);
     const count = res.quotient;
     remaining = Amounts.sub(remaining, Amounts.mult(cost, count).amount).amount;
     if (count > 0) {
       totalCoinValue = Amounts.add(
         totalCoinValue,
-        Amounts.mult(DenominationRecord.getValue(d), count).amount,
+        Amounts.mult(d.value, count).amount,
       ).amount;
       totalWithdrawCost = Amounts.add(
         totalWithdrawCost,
@@ -766,30 +758,22 @@ export function selectForcedWithdrawalDenominations(
   let totalWithdrawCost = Amounts.zeroOfCurrency(amountAvailable.currency);
 
   denoms = denoms.filter((d) => isWithdrawableDenom(d, denomselAllowLate));
-  denoms.sort((d1, d2) =>
-    Amounts.cmp(
-      DenominationRecord.getValue(d2),
-      DenominationRecord.getValue(d1),
-    ),
-  );
+  denoms.sort((d1, d2) => Amounts.cmp(d2.value, d1.value));
 
   for (const fds of forcedDenomSel.denoms) {
     const count = fds.count;
     const denom = denoms.find((x) => {
-      return Amounts.cmp(DenominationRecord.getValue(x), fds.value) == 0;
+      return Amounts.cmp(x.value, fds.value) == 0;
     });
     if (!denom) {
       throw Error(
         `unable to find denom for forced selection (value ${fds.value})`,
       );
     }
-    const cost = Amounts.add(
-      DenominationRecord.getValue(denom),
-      denom.fees.feeWithdraw,
-    ).amount;
+    const cost = Amounts.add(denom.value, denom.fees.feeWithdraw).amount;
     totalCoinValue = Amounts.add(
       totalCoinValue,
-      Amounts.mult(DenominationRecord.getValue(denom), count).amount,
+      Amounts.mult(denom.value, count).amount,
     ).amount;
     totalWithdrawCost = Amounts.add(
       totalWithdrawCost,
-- 
cgit v1.2.3