wallet: more time format fixes

8 files changed, 64 insertions, 41 deletions

diff --git a/packages/taler-wallet-cli/src/integrationtests/test-clause-schnorr.ts b/packages/taler-wallet-cli/src/integrationtests/test-clause-schnorr.ts
index c8b4176d5..5a84866ac 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-clause-schnorr.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-clause-schnorr.ts
@@ -53,12 +53,8 @@ export async function runClauseSchnorrTest(t: GlobalTestState) {
     name: "rsa_dummy",
   });
 
-  const {
-    wallet,
-    bank,
-    exchange,
-    merchant,
-  } = await createSimpleTestkudosEnvironment(t, coinConfig);
+  const { wallet, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironment(t, coinConfig);
 
   // Withdraw digital cash into the wallet.
 
@@ -98,3 +94,4 @@ export async function runClauseSchnorrTest(t: GlobalTestState) {
 }
 
 runClauseSchnorrTest.suites = ["wallet"];
+runClauseSchnorrTest.excludeByDefault = true;
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
index 8f7d77712..aa5d4c9c0 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-libeufin-basic.ts
@@ -20,6 +20,8 @@
 import {
   AbsoluteTime,
   ContractTerms,
+  Duration,
+  durationFromSpec,
 } from "@gnu-taler/taler-util";
 import {
   WalletApiOperation,
@@ -209,7 +211,9 @@ export async function createLibeufinTestEnvironment(
     id: "default",
     name: "Default Instance",
     paytoUris: [`payto://iban/${merchantIban}?receiver-name=Merchant`],
-    defaultWireTransferDelay: { d_ms: 0 },
+    defaultWireTransferDelay: Duration.toTalerProtocolDuration(
+      Duration.getZero(),
+    ),
   });
 
   console.log("setup done!");
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-urls.ts b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-urls.ts
index 6f76e2325..f72189014 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-urls.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-instances-urls.ts
@@ -17,6 +17,7 @@
 /**
  * Imports.
  */
+import { Duration } from "@gnu-taler/taler-util";
 import axios from "axios";
 import {
   ExchangeService,
@@ -24,7 +25,7 @@ import {
   MerchantApiClient,
   MerchantService,
   setupDb,
-  getPayto
+  getPayto,
 } from "../harness/harness.js";
 
 /**
@@ -67,9 +68,13 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
     address: {},
     default_max_deposit_fee: "TESTKUDOS:1",
     default_max_wire_fee: "TESTKUDOS:1",
-    default_pay_delay: { d_ms: 60000 },
+    default_pay_delay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ seconds: 60 }),
+    ),
     default_wire_fee_amortization: 1,
-    default_wire_transfer_delay: { d_ms: 60000 },
+    default_wire_transfer_delay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ seconds: 60 }),
+    ),
     jurisdiction: {},
     name: "My Default Instance",
     payto_uris: [getPayto("bar")],
@@ -84,9 +89,13 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
     address: {},
     default_max_deposit_fee: "TESTKUDOS:1",
     default_max_wire_fee: "TESTKUDOS:1",
-    default_pay_delay: { d_ms: 60000 },
+    default_pay_delay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ seconds: 60 }),
+    ),
     default_wire_fee_amortization: 1,
-    default_wire_transfer_delay: { d_ms: 60000 },
+    default_wire_transfer_delay: Duration.toTalerProtocolDuration(
+      Duration.fromSpec({ seconds: 60 }),
+    ),
     jurisdiction: {},
     name: "My Second Instance",
     payto_uris: [getPayto("bar")],
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
index a9dbeef9a..539904f1c 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-merchant-refund-api.ts
@@ -32,6 +32,7 @@ import {
   URL,
   durationFromSpec,
   PreparePayResultType,
+  Duration,
 } from "@gnu-taler/taler-util";
 import axios from "axios";
 import {
@@ -57,7 +58,9 @@ async function testRefundApiWithFulfillmentUrl(
       amount: "TESTKUDOS:5",
       fulfillment_url: "https://example.com/fulfillment",
     },
-    refund_delay: durationFromSpec({ minutes: 5 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 5 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
@@ -171,7 +174,9 @@ async function testRefundApiWithFulfillmentMessage(
       amount: "TESTKUDOS:5",
       fulfillment_message: "Thank you for buying foobar",
     },
-    refund_delay: durationFromSpec({ minutes: 5 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 5 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts
index 574177c8c..4c2a2f94a 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-auto.ts
@@ -22,7 +22,7 @@ import {
   createSimpleTestkudosEnvironment,
   withdrawViaBank,
 } from "../harness/helpers.js";
-import { durationFromSpec } from "@gnu-taler/taler-util";
+import { Duration, durationFromSpec } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 
 /**
@@ -48,7 +48,9 @@ export async function runRefundAutoTest(t: GlobalTestState) {
         d_us: 3000 * 1000,
       },
     },
-    refund_delay: durationFromSpec({ minutes: 5 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 5 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
index 24600384b..b6cefda86 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-gone.ts
@@ -25,6 +25,7 @@ import {
 } from "../harness/helpers.js";
 import {
   AbsoluteTime,
+  Duration,
   durationFromSpec,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
@@ -35,12 +36,8 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 export async function runRefundGoneTest(t: GlobalTestState) {
   // Set up test environment
 
-  const {
-    wallet,
-    bank,
-    exchange,
-    merchant,
-  } = await createSimpleTestkudosEnvironment(t);
+  const { wallet, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
@@ -62,7 +59,9 @@ export async function runRefundGoneTest(t: GlobalTestState) {
         ),
       ),
     },
-    refund_delay: durationFromSpec({ minutes: 1 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 1 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
index 47c2293e2..e4e96a180 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund-incremental.ts
@@ -17,12 +17,20 @@
 /**
  * Imports.
  */
-import { GlobalTestState, delayMs, MerchantPrivateApi } from "../harness/harness.js";
-import { createSimpleTestkudosEnvironment, withdrawViaBank } from "../harness/helpers.js";
+import {
+  GlobalTestState,
+  delayMs,
+  MerchantPrivateApi,
+} from "../harness/harness.js";
+import {
+  createSimpleTestkudosEnvironment,
+  withdrawViaBank,
+} from "../harness/helpers.js";
 import {
   TransactionType,
   Amounts,
   durationFromSpec,
+  Duration,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 
@@ -32,12 +40,8 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 export async function runRefundIncrementalTest(t: GlobalTestState) {
   // Set up test environment
 
-  const {
-    wallet,
-    bank,
-    exchange,
-    merchant,
-  } = await createSimpleTestkudosEnvironment(t);
+  const { wallet, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
@@ -51,7 +55,9 @@ export async function runRefundIncrementalTest(t: GlobalTestState) {
       amount: "TESTKUDOS:10",
       fulfillment_url: "taler://fulfillment-success/thx",
     },
-    refund_delay: durationFromSpec({ minutes: 5 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 5 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-refund.ts b/packages/taler-wallet-cli/src/integrationtests/test-refund.ts
index f11771922..b63dad590 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-refund.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-refund.ts
@@ -17,10 +17,13 @@
 /**
  * Imports.
  */
-import { durationFromSpec } from "@gnu-taler/taler-util";
+import { Duration, durationFromSpec } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
-import { createSimpleTestkudosEnvironment, withdrawViaBank } from "../harness/helpers.js";
+import {
+  createSimpleTestkudosEnvironment,
+  withdrawViaBank,
+} from "../harness/helpers.js";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
@@ -28,12 +31,8 @@ import { createSimpleTestkudosEnvironment, withdrawViaBank } from "../harness/he
 export async function runRefundTest(t: GlobalTestState) {
   // Set up test environment
 
-  const {
-    wallet,
-    bank,
-    exchange,
-    merchant,
-  } = await createSimpleTestkudosEnvironment(t);
+  const { wallet, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
@@ -47,7 +46,9 @@ export async function runRefundTest(t: GlobalTestState) {
       amount: "TESTKUDOS:5",
       fulfillment_url: "taler://fulfillment-success/thx",
     },
-    refund_delay: durationFromSpec({ minutes: 5 }),
+    refund_delay: Duration.toTalerProtocolDuration(
+      durationFromSpec({ minutes: 5 }),
+    ),
   });
 
   let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {