diff options
author | Florian Dold <florian@dold.me> | 2022-05-19 11:01:07 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-05-19 11:01:07 +0200 |
commit | 25af1987b26000de0f8272678675978b27d14775 (patch) | |
tree | 004ca85c4658a68eee180fe26645f41116a3e394 | |
parent | b2931fbac62a128862f310028c16b32b12f0c14e (diff) |
-formattingv0.9.0-dev.11
-rw-r--r-- | packages/taler-wallet-core/src/operations/pay.ts | 10 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/retries.ts | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index e8604d3fc..f22d51a9d 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -95,9 +95,7 @@ import { throwUnexpectedRequestError, } from "../util/http.js"; import { GetReadWriteAccess } from "../util/query.js"; -import { - RetryInfo, -} from "../util/retries.js"; +import { RetryInfo } from "../util/retries.js"; import { getExchangeDetails } from "./exchanges.js"; import { createRefreshGroup, getTotalRefreshCost } from "./refresh.js"; import { guardOperationException } from "./common.js"; @@ -606,9 +604,9 @@ async function failProposalPermanently( function getProposalRequestTimeout(proposal: ProposalRecord): Duration { return Duration.clamp({ - lower: Duration.fromSpec({ seconds: 1}), - upper: Duration.fromSpec({seconds: 60}), - value: getRetryDuration(proposal.retryInfo), + lower: Duration.fromSpec({ seconds: 1 }), + upper: Duration.fromSpec({ seconds: 60 }), + value: RetryInfo.getDuration(proposal.retryInfo), }); } diff --git a/packages/taler-wallet-core/src/util/retries.ts b/packages/taler-wallet-core/src/util/retries.ts index 965ba033a..2697ca4ab 100644 --- a/packages/taler-wallet-core/src/util/retries.ts +++ b/packages/taler-wallet-core/src/util/retries.ts @@ -66,7 +66,6 @@ function updateTimeout( } export namespace RetryInfo { - export function getDuration( r: RetryInfo | undefined, p: RetryPolicy = defaultRetryPolicy, @@ -80,7 +79,8 @@ export namespace RetryInfo { } 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), + d_ms: + p.maxTimeout.d_ms === "forever" ? t : Math.min(p.maxTimeout.d_ms, t), }; } |