From 5695ae0a9f469ddbcd86e675f8f74b30032be457 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Sat, 1 Jul 2023 01:43:29 +0200
Subject: wallet-core: use testingWaitTransactionsFinal to wait for
 transactions

---
 .../taler-wallet-core/src/operations/refresh.ts    | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/refresh.ts')

diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts
index fd6281eda..6eb221c1c 100644
--- a/packages/taler-wallet-core/src/operations/refresh.ts
+++ b/packages/taler-wallet-core/src/operations/refresh.ts
@@ -263,22 +263,25 @@ async function refreshCreateSession(
         availableAmount,
       )} too small`,
     );
-    // FIXME: State transition notification missing.
-    await ws.db
+    const transitionInfo = await ws.db
       .mktx((x) => [x.coins, x.coinAvailability, x.refreshGroups])
       .runReadWrite(async (tx) => {
         const rg = await tx.refreshGroups.get(refreshGroupId);
         if (!rg) {
           return;
         }
+        const oldTxState = computeRefreshTransactionState(rg);
         rg.statusPerCoin[coinIndex] = RefreshCoinStatus.Finished;
         const updateRes = updateGroupStatus(rg);
         if (updateRes.final) {
           await makeCoinsVisible(ws, tx, transactionId);
         }
         await tx.refreshGroups.put(rg);
+        const newTxState = computeRefreshTransactionState(rg);
+        return { oldTxState, newTxState };
       });
     ws.notify({ type: NotificationType.BalanceChange });
+    notifyTransition(ws, transactionId, transitionInfo);
     return;
   }
 
@@ -438,7 +441,7 @@ async function refreshMelt(
 
   if (resp.status === HttpStatusCode.NotFound) {
     const errDetails = await readUnexpectedResponseDetails(resp);
-    await ws.db
+    const transitionInfo = await ws.db
       .mktx((x) => [x.refreshGroups, x.coins, x.coinAvailability])
       .runReadWrite(async (tx) => {
         const rg = await tx.refreshGroups.get(refreshGroupId);
@@ -451,6 +454,7 @@ async function refreshMelt(
         if (rg.statusPerCoin[coinIndex] !== RefreshCoinStatus.Pending) {
           return;
         }
+        const oldTxState = computeRefreshTransactionState(rg);
         rg.statusPerCoin[coinIndex] = RefreshCoinStatus.Failed;
         rg.lastErrorPerCoin[coinIndex] = errDetails;
         const updateRes = updateGroupStatus(rg);
@@ -458,8 +462,14 @@ async function refreshMelt(
           await makeCoinsVisible(ws, tx, transactionId);
         }
         await tx.refreshGroups.put(rg);
+        const newTxState = computeRefreshTransactionState(rg);
+        return {
+          oldTxState,
+          newTxState,
+        };
       });
     ws.notify({ type: NotificationType.BalanceChange });
+    notifyTransition(ws, transactionId, transitionInfo);
     return;
   }
 
@@ -739,7 +749,7 @@ async function refreshReveal(
     }
   }
 
-  await ws.db
+  const transitionInfo = await ws.db
     .mktx((x) => [
       x.coins,
       x.denominations,
@@ -756,6 +766,7 @@ async function refreshReveal(
       if (!rs) {
         return;
       }
+      const oldTxState = computeRefreshTransactionState(rg);
       rg.statusPerCoin[coinIndex] = RefreshCoinStatus.Finished;
       updateGroupStatus(rg);
       for (const coin of coins) {
@@ -763,7 +774,10 @@ async function refreshReveal(
       }
       await makeCoinsVisible(ws, tx, transactionId);
       await tx.refreshGroups.put(rg);
+      const newTxState = computeRefreshTransactionState(rg);
+      return { oldTxState, newTxState };
     });
+  notifyTransition(ws, transactionId, transitionInfo);
   logger.trace("refresh finished (end of reveal)");
 }
 
@@ -778,7 +792,7 @@ export async function processRefreshGroup(
     .mktx((x) => [x.refreshGroups])
     .runReadOnly(async (tx) => tx.refreshGroups.get(refreshGroupId));
   if (!refreshGroup) {
-    return TaskRunResult.finished()
+    return TaskRunResult.finished();
   }
   if (refreshGroup.timestampFinished) {
     return TaskRunResult.finished();
@@ -1235,10 +1249,6 @@ export async function suspendRefreshGroup(
     tag: TransactionType.Refresh,
     refreshGroupId,
   });
-  const retryTag = constructTaskIdentifier({
-    tag: PendingTaskType.Refresh,
-    refreshGroupId,
-  });
   let res = await ws.db
     .mktx((x) => [x.refreshGroups])
     .runReadWrite(async (tx) => {
-- 
cgit v1.2.3