From c67d0bff1daa35d380d1d71b94428a5026b56450 Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Wed, 18 May 2022 14:41:51 -0300
Subject: all retryInfo function in the same namespace, adding missing
 retryInfo increment

---
 packages/taler-wallet-core/src/util/retries.ts | 61 +++++++++++++-------------
 1 file changed, 31 insertions(+), 30 deletions(-)

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

diff --git a/packages/taler-wallet-core/src/util/retries.ts b/packages/taler-wallet-core/src/util/retries.ts
index 8b7d64406..965ba033a 100644
--- a/packages/taler-wallet-core/src/util/retries.ts
+++ b/packages/taler-wallet-core/src/util/retries.ts
@@ -41,7 +41,7 @@ const defaultRetryPolicy: RetryPolicy = {
   maxTimeout: { d_ms: 6000 },
 };
 
-export function updateRetryInfoTimeout(
+function updateTimeout(
   r: RetryInfo,
   p: RetryPolicy = defaultRetryPolicy,
 ): void {
@@ -65,45 +65,46 @@ export function updateRetryInfoTimeout(
   r.nextRetry = { t_ms: t };
 }
 
-export function getRetryDuration(
-  r: RetryInfo | undefined,
-  p: RetryPolicy = defaultRetryPolicy,
-): Duration {
-  if (!r) {
-    // If we don't have any retry info, run immediately.
-    return { d_ms: 0 };
-  }
-  if (p.backoffDelta.d_ms === "forever") {
-    return { d_ms: "forever" };
+export namespace RetryInfo {
+
+  export function getDuration(
+    r: RetryInfo | undefined,
+    p: RetryPolicy = defaultRetryPolicy,
+  ): Duration {
+    if (!r) {
+      // If we don't have any retry info, run immediately.
+      return { d_ms: 0 };
+    }
+    if (p.backoffDelta.d_ms === "forever") {
+      return { d_ms: "forever" };
+    }
+    const t = p.backoffDelta.d_ms * Math.pow(p.backoffBase, r.retryCounter);
+    return {
+      d_ms: p.maxTimeout.d_ms === "forever" ? t : Math.min(p.maxTimeout.d_ms, t),
+    };
   }
-  const t = p.backoffDelta.d_ms * Math.pow(p.backoffBase, r.retryCounter);
-  return {
-    d_ms: p.maxTimeout.d_ms === "forever" ? t : Math.min(p.maxTimeout.d_ms, t),
-  };
-}
 
-export function resetRetryInfo(p: RetryPolicy = defaultRetryPolicy): RetryInfo {
-  const now = AbsoluteTime.now();
-  const info = {
-    firstTry: now,
-    nextRetry: now,
-    retryCounter: 0,
-  };
-  updateRetryInfoTimeout(info, p);
-  return info;
-}
+  export function reset(p: RetryPolicy = defaultRetryPolicy): RetryInfo {
+    const now = AbsoluteTime.now();
+    const info = {
+      firstTry: now,
+      nextRetry: now,
+      retryCounter: 0,
+    };
+    updateTimeout(info, p);
+    return info;
+  }
 
-export namespace RetryInfo {
   export function increment(
     r: RetryInfo | undefined,
     p: RetryPolicy = defaultRetryPolicy,
-  ) {
+  ): RetryInfo {
     if (!r) {
-      return resetRetryInfo(p);
+      return reset(p);
     }
     const r2 = { ...r };
     r2.retryCounter++;
-    updateRetryInfoTimeout(r2, p);
+    updateTimeout(r2, p);
     return r2;
   }
 }
-- 
cgit v1.2.3