From c7a2abedbabe9142ce9a15902f90a5d1f4b36f05 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 4 Sep 2020 03:10:36 +0530
Subject: don't unnecessarily repeat reserve processing after recoup

---
 packages/taler-wallet-core/src/operations/reserves.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/packages/taler-wallet-core/src/operations/reserves.ts b/packages/taler-wallet-core/src/operations/reserves.ts
index a28c2e0cf..69942fe94 100644
--- a/packages/taler-wallet-core/src/operations/reserves.ts
+++ b/packages/taler-wallet-core/src/operations/reserves.ts
@@ -291,7 +291,7 @@ export async function forceQueryReserve(
         break;
       default:
         reserve.requestedQuery = true;
-        return;
+        break;
     }
     reserve.retryInfo = initRetryInfo();
     await tx.put(Stores.reserves, reserve);
@@ -601,13 +601,17 @@ async function updateReserve(
         logger.trace("setting reserve status to 'withdrawing' after query");
         r.reserveStatus = ReserveRecordStatus.WITHDRAWING;
         r.retryInfo = initRetryInfo();
+        r.requestedQuery = false;
       } else {
-        logger.trace("setting reserve status to 'dormant' after query");
         if (r.requestedQuery) {
+          logger.trace(
+            "setting reserve status to 'querying-status' (requested query) after query",
+          );
           r.reserveStatus = ReserveRecordStatus.QUERYING_STATUS;
           r.requestedQuery = false;
           r.retryInfo = initRetryInfo();
         } else {
+          logger.trace("setting reserve status to 'dormant' after query");
           r.reserveStatus = ReserveRecordStatus.DORMANT;
           r.retryInfo = initRetryInfo(false);
         }
@@ -622,7 +626,9 @@ async function updateReserve(
   ws.notify({ type: NotificationType.ReserveUpdated, updateSummary });
   const reserve2 = await ws.db.get(Stores.reserves, reservePub);
   if (reserve2) {
-    logger.trace(`after db transaction, reserve status is ${reserve2.reserveStatus}`);
+    logger.trace(
+      `after db transaction, reserve status is ${reserve2.reserveStatus}`,
+    );
   }
   return { ready: true };
 }
-- 
cgit v1.2.3