From 8ad36d89f55783c34043ee9ef37759cd94bcec7c Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 10 Jun 2021 16:32:37 +0200
Subject: simplify pending transactions, make more tests pass again

---
 packages/taler-wallet-core/src/util/contractTerms.ts | 2 --
 packages/taler-wallet-core/src/util/retries.ts       | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/packages/taler-wallet-core/src/util/contractTerms.ts b/packages/taler-wallet-core/src/util/contractTerms.ts
index cf61cc05f..5fb23cf8c 100644
--- a/packages/taler-wallet-core/src/util/contractTerms.ts
+++ b/packages/taler-wallet-core/src/util/contractTerms.ts
@@ -121,7 +121,6 @@ export namespace ContractTermsUtil {
    * to forgettable fields and other restrictions for forgettable JSON.
    */
   export function validateForgettable(anyJson: any): boolean {
-    console.warn("calling validateForgettable", anyJson);
     if (typeof anyJson === "string") {
       return true;
     }
@@ -206,7 +205,6 @@ export namespace ContractTermsUtil {
             }
           }
         } else {
-          console.warn("invalid type");
           return false;
         }
       }
diff --git a/packages/taler-wallet-core/src/util/retries.ts b/packages/taler-wallet-core/src/util/retries.ts
index 54bb0b2ee..a7f4cd281 100644
--- a/packages/taler-wallet-core/src/util/retries.ts
+++ b/packages/taler-wallet-core/src/util/retries.ts
@@ -81,10 +81,11 @@ export function initRetryInfo(
       retryCounter: 0,
     };
   }
+  const now = getTimestampNow();
   const info = {
-    firstTry: getTimestampNow(),
+    firstTry: now,
     active: true,
-    nextRetry: { t_ms: 0 },
+    nextRetry: now,
     retryCounter: 0,
   };
   updateRetryInfoTimeout(info, p);
-- 
cgit v1.2.3