From a60a1d867cfe6a12f1e6fadfa037f022e9385107 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Tue, 5 Sep 2023 10:46:06 +0200
Subject: harness: remove deprecated testing APIs

---
 .../integrationtests/test-timetravel-withdraw.ts   | 40 +++++++++++++---------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-timetravel-withdraw.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-timetravel-withdraw.ts b/packages/taler-harness/src/integrationtests/test-timetravel-withdraw.ts
index ca3e67647..e594d2d72 100644
--- a/packages/taler-harness/src/integrationtests/test-timetravel-withdraw.ts
+++ b/packages/taler-harness/src/integrationtests/test-timetravel-withdraw.ts
@@ -17,13 +17,16 @@
 /**
  * Imports.
  */
-import { Duration, TransactionMajorState, TransactionType } from "@gnu-taler/taler-util";
+import {
+  Duration,
+  TransactionMajorState,
+  TransactionType,
+} from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  startWithdrawViaBank,
-  withdrawViaBank,
+  createSimpleTestkudosEnvironmentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 /**
@@ -32,12 +35,18 @@ import {
 export async function runTimetravelWithdrawTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet, bank, exchange, merchant } =
-    await createSimpleTestkudosEnvironment(t);
+  const { walletClient, bank, exchange, merchant } =
+    await createSimpleTestkudosEnvironmentV2(t);
 
   // Withdraw digital cash into the wallet.
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:15" });
+  const wres1 = await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:15",
+  });
+  await wres1.withdrawalFinishedCond;
 
   // Travel 400 days into the future,
   // as the deposit expiration is two years
@@ -47,21 +56,21 @@ export async function runTimetravelWithdrawTest(t: GlobalTestState) {
   };
 
   await exchange.stop();
-  exchange.setTimetravel(timetravelDuration);
+  exchange.setTimetravel(Duration.toMilliseconds(timetravelDuration));
   await exchange.start();
   await exchange.pingUntilAvailable();
   await exchange.keyup();
 
   await merchant.stop();
-  merchant.setTimetravel(timetravelDuration);
+  merchant.setTimetravel(Duration.toMilliseconds(timetravelDuration));
   await merchant.start();
   await merchant.pingUntilAvailable();
 
   console.log("starting withdrawal via bank");
 
   // This should fail, as the wallet didn't time travel yet.
-  await startWithdrawViaBank(t, {
-    wallet,
+  await withdrawViaBankV2(t, {
+    walletClient,
     bank,
     exchange,
     amount: "TESTKUDOS:20",
@@ -71,10 +80,7 @@ export async function runTimetravelWithdrawTest(t: GlobalTestState) {
 
   // Check that transactions are correct for the failed withdrawal
   {
-    console.log("running until done (should run into maxRetries limit)");
-    await wallet.runUntilDone({ maxRetries: 5 });
-    console.log("wallet done running");
-    const transactions = await wallet.client.call(
+    const transactions = await walletClient.call(
       WalletApiOperation.GetTransactions,
       {},
     );
@@ -88,7 +94,9 @@ export async function runTimetravelWithdrawTest(t: GlobalTestState) {
 
   // Now we also let the wallet time travel
 
-  wallet.setTimetravel(timetravelDuration);
+  walletClient.call(WalletApiOperation.TestingSetTimetravel, {
+    offsetMs: Duration.toMilliseconds(timetravelDuration),
+  });
 
   // This doesn't work yet, see https://bugs.taler.net/n/6585
 
-- 
cgit v1.2.3