From 6cc3fb3d0466e89b67be271009a2fc95f3ed41ca Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 24 Aug 2023 18:29:54 +0200
Subject: harness: modernize some tests

---
 .../integrationtests/test-wallet-backup-basic.ts   | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-wallet-backup-basic.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-wallet-backup-basic.ts b/packages/taler-harness/src/integrationtests/test-wallet-backup-basic.ts
index f36e2e4f1..5321cf5c7 100644
--- a/packages/taler-harness/src/integrationtests/test-wallet-backup-basic.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallet-backup-basic.ts
@@ -22,7 +22,9 @@ import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState, WalletCli } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironment,
+  createSimpleTestkudosEnvironmentV2,
   withdrawViaBank,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 import { SyncService } from "../harness/sync.js";
 
@@ -32,8 +34,8 @@ import { SyncService } from "../harness/sync.js";
 export async function runWalletBackupBasicTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { commonDb, merchant, wallet, bank, exchange } =
-    await createSimpleTestkudosEnvironment(t);
+  const { commonDb, merchant, walletClient, bank, exchange } =
+    await createSimpleTestkudosEnvironmentV2(t);
 
   const sync = await SyncService.create(t, {
     currency: "TESTKUDOS",
@@ -49,32 +51,32 @@ export async function runWalletBackupBasicTest(t: GlobalTestState) {
   await sync.start();
   await sync.pingUntilAvailable();
 
-  await wallet.client.call(WalletApiOperation.AddBackupProvider, {
+  await walletClient.call(WalletApiOperation.AddBackupProvider, {
     backupProviderBaseUrl: sync.baseUrl,
     activate: false,
     name: sync.baseUrl,
   });
 
   {
-    const bi = await wallet.client.call(WalletApiOperation.GetBackupInfo, {});
+    const bi = await walletClient.call(WalletApiOperation.GetBackupInfo, {});
     t.assertDeepEqual(bi.providers[0].active, false);
   }
 
-  await wallet.client.call(WalletApiOperation.AddBackupProvider, {
+  await walletClient.call(WalletApiOperation.AddBackupProvider, {
     backupProviderBaseUrl: sync.baseUrl,
     activate: true,
     name: sync.baseUrl,
   });
 
   {
-    const bi = await wallet.client.call(WalletApiOperation.GetBackupInfo, {});
+    const bi = await walletClient.call(WalletApiOperation.GetBackupInfo, {});
     t.assertDeepEqual(bi.providers[0].active, true);
   }
 
-  await wallet.client.call(WalletApiOperation.RunBackupCycle, {});
+  await walletClient.call(WalletApiOperation.RunBackupCycle, {});
 
   {
-    const bi = await wallet.client.call(WalletApiOperation.GetBackupInfo, {});
+    const bi = await walletClient.call(WalletApiOperation.GetBackupInfo, {});
     console.log(bi);
     t.assertDeepEqual(
       bi.providers[0].paymentStatus.type,
@@ -82,32 +84,32 @@ export async function runWalletBackupBasicTest(t: GlobalTestState) {
     );
   }
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:10" });
+  await withdrawViaBankV2(t, { walletClient, bank, exchange, amount: "TESTKUDOS:10" });
 
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 
-  await wallet.client.call(WalletApiOperation.RunBackupCycle, {});
+  await walletClient.call(WalletApiOperation.RunBackupCycle, {});
 
   {
-    const bi = await wallet.client.call(WalletApiOperation.GetBackupInfo, {});
+    const bi = await walletClient.call(WalletApiOperation.GetBackupInfo, {});
     console.log(bi);
   }
 
-  await withdrawViaBank(t, { wallet, bank, exchange, amount: "TESTKUDOS:5" });
+  await withdrawViaBankV2(t, { walletClient, bank, exchange, amount: "TESTKUDOS:5" });
 
-  await wallet.client.call(WalletApiOperation.RunBackupCycle, {});
+  await walletClient.call(WalletApiOperation.RunBackupCycle, {});
 
   {
-    const bi = await wallet.client.call(WalletApiOperation.GetBackupInfo, {});
+    const bi = await walletClient.call(WalletApiOperation.GetBackupInfo, {});
     console.log(bi);
   }
 
-  const backupRecovery = await wallet.client.call(
+  const backupRecovery = await walletClient.call(
     WalletApiOperation.ExportBackupRecovery,
     {},
   );
 
-  const txs = await wallet.client.call(WalletApiOperation.GetTransactions, {});
+  const txs = await walletClient.call(WalletApiOperation.GetTransactions, {});
   console.log(`backed up transactions ${j2s(txs)}`);
 
   const wallet2 = new WalletCli(t, "wallet2");
-- 
cgit v1.2.3