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-exchange-timetravel.ts   | 63 +++++++++-------------
 1 file changed, 25 insertions(+), 38 deletions(-)

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

diff --git a/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts b/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts
index 5ae97c3da..401cc4ff2 100644
--- a/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts
+++ b/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts
@@ -41,7 +41,11 @@ import {
   setupDb,
   WalletCli,
 } from "../harness/harness.js";
-import { withdrawViaBank } from "../harness/helpers.js";
+import {
+  applyTimeTravelV2,
+  createWalletDaemonWithClient,
+  withdrawViaBankV2,
+} from "../harness/helpers.js";
 
 const logger = new Logger("test-exchange-timetravel.ts");
 
@@ -89,34 +93,6 @@ function getDenomInfoFromKeys(ek: ExchangeKeysJson): DenomInfo[] {
   return denomInfos;
 }
 
-async function applyTimeTravel(
-  timetravelDuration: Duration,
-  s: {
-    exchange?: ExchangeService;
-    merchant?: MerchantService;
-    wallet?: WalletCli;
-  },
-): Promise<void> {
-  if (s.exchange) {
-    await s.exchange.stop();
-    s.exchange.setTimetravel(timetravelDuration);
-    await s.exchange.start();
-    await s.exchange.pingUntilAvailable();
-  }
-
-  if (s.merchant) {
-    await s.merchant.stop();
-    s.merchant.setTimetravel(timetravelDuration);
-    await s.merchant.start();
-    await s.merchant.pingUntilAvailable();
-  }
-
-  if (s.wallet) {
-    console.log("setting wallet time travel to", timetravelDuration);
-    s.wallet.setTimetravel(timetravelDuration);
-  }
-}
-
 const http = createPlatformHttpLib({
   allowHttp: true,
   enableThrottling: false,
@@ -173,13 +149,13 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) {
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
     paytoUris: [getPayto("merchant-default")],
   });
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
     paytoUris: [getPayto("minst1")],
@@ -187,11 +163,19 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) {
 
   console.log("setup done!");
 
-  const wallet = new WalletCli(t);
+  const { walletClient } = await createWalletDaemonWithClient(t, {
+    name: "default",
+  });
 
   // Withdraw digital cash into the wallet.
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:15" });
+  const wres = await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:15",
+  });
+  await wres.withdrawalFinishedCond;
 
   const keysResp1 = await http.fetch(exchange.baseUrl + "keys");
   const keys1 = await readSuccessResponseJsonOrThrow(
@@ -206,11 +190,14 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) {
   // Travel into the future, the deposit expiration is two years
   // into the future.
   console.log("applying first time travel");
-  await applyTimeTravel(durationFromSpec({ days: 400 }), {
-    wallet,
-    exchange,
-    merchant,
-  });
+  await applyTimeTravelV2(
+    Duration.toMilliseconds(durationFromSpec({ days: 400 })),
+    {
+      walletClient,
+      exchange,
+      merchant,
+    },
+  );
 
   const keysResp2 = await http.fetch(exchange.baseUrl + "keys");
   const keys2 = await readSuccessResponseJsonOrThrow(
-- 
cgit v1.2.3