taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

wallet-core: clamp claim retry properly

Browse Source
This commit is contained in:
Florian Dold 2022-05-19 10:36:01 +02:00
parent 611a57ca0a
commit b2931fbac6
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/taler-util/src/time.ts
View File

@ -91,19 +91,24 @@ export namespace Duration {
} }
return { d_ms: deadline.t_ms - now.t_ms }; return { d_ms: deadline.t_ms - now.t_ms };
} }
export function toIntegerYears(d: Duration): number { export function toIntegerYears(d: Duration): number {
if (typeof d.d_ms !== "number") { if (typeof d.d_ms !== "number") {
throw Error("infinite duration"); throw Error("infinite duration");
} }
return Math.ceil(d.d_ms / 1000 / 60 / 60 / 24 / 365); return Math.ceil(d.d_ms / 1000 / 60 / 60 / 24 / 365);
} }
export const fromSpec = durationFromSpec; export const fromSpec = durationFromSpec;
export function getForever(): Duration { export function getForever(): Duration {
return { d_ms: "forever" }; return { d_ms: "forever" };
} }
export function getZero(): Duration { export function getZero(): Duration {
return { d_ms: 0 }; return { d_ms: 0 };
} }
export function fromTalerProtocolDuration( export function fromTalerProtocolDuration(
d: TalerProtocolDuration, d: TalerProtocolDuration,
): Duration { ): Duration {
@ -116,6 +121,7 @@ export namespace Duration {
d_ms: d.d_us / 1000, d_ms: d.d_us / 1000,
}; };
} }
export function toTalerProtocolDuration(d: Duration): TalerProtocolDuration { export function toTalerProtocolDuration(d: Duration): TalerProtocolDuration {
if (d.d_ms === "forever") { if (d.d_ms === "forever") {
return { return {
@ -126,6 +132,14 @@ export namespace Duration {
d_us: d.d_ms * 1000, d_us: d.d_ms * 1000,
}; };
} }
export function clamp(args: {
lower: Duration;
upper: Duration;
value: Duration;
}): Duration {
return durationMax(durationMin(args.value, args.upper), args.lower);
}
} }
export namespace AbsoluteTime { export namespace AbsoluteTime {

2
packages/taler-wallet-cli/src/harness/harness.ts
View File

@ -1659,7 +1659,7 @@ export class MerchantService implements MerchantServiceInterface {
await exec(`taler-merchant-dbinit -c "${this.configFilename}"`); await exec(`taler-merchant-dbinit -c "${this.configFilename}"`);
this.proc = this.globalState.spawnService( this.proc = this.globalState.spawnService(
"valgrind", "taler-merchant-httpd",
[ [
"taler-merchant-httpd", "taler-merchant-httpd",
"-LDEBUG", "-LDEBUG",

10
packages/taler-wallet-core/src/operations/pay.ts
View File

@ -26,7 +26,6 @@
*/ */
import { import {
AbsoluteTime, AbsoluteTime,
AgeRestriction,
AmountJson, AmountJson,
Amounts, Amounts,
codecForContractTerms, codecForContractTerms,
@ -606,10 +605,11 @@ async function failProposalPermanently(
} }
function getProposalRequestTimeout(proposal: ProposalRecord): Duration { function getProposalRequestTimeout(proposal: ProposalRecord): Duration {
return durationMax( return Duration.clamp({
{ d_ms: 60000 }, lower: Duration.fromSpec({ seconds: 1}),
durationMin({ d_ms: 5000 }, RetryInfo.getDuration(proposal.retryInfo)), upper: Duration.fromSpec({seconds: 60}),
); value: getRetryDuration(proposal.retryInfo),
});
} }
function getPayRequestTimeout(purchase: PurchaseRecord): Duration { function getPayRequestTimeout(purchase: PurchaseRecord): Duration {