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

---
 .../test-age-restrictions-mixed-merchant.ts        | 53 ++++++++++++----------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
index 8bf71b63d..970acbb72 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
@@ -17,12 +17,15 @@
 /**
  * Imports.
  */
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { defaultCoinConfig } from "../harness/denomStructures.js";
 import { GlobalTestState, WalletCli } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
   makeTestPayment,
+  createSimpleTestkudosEnvironmentV2,
+  withdrawViaBankV2,
+  makeTestPaymentV2,
+  createWalletDaemonWithClient,
 } from "../harness/helpers.js";
 
 /**
@@ -32,11 +35,11 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
   // Set up test environment
 
   const {
-    wallet: walletOne,
+    walletClient: walletOne,
     bank,
     exchange,
     merchant,
-  } = await createSimpleTestkudosEnvironment(
+  } = await createSimpleTestkudosEnvironmentV2(
     t,
     defaultCoinConfig.map((x) => x("TESTKUDOS")),
     {
@@ -45,14 +48,19 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
     },
   );
 
-  const walletTwo = new WalletCli(t, "walletTwo");
-  const walletThree = new WalletCli(t, "walletThree");
+  const { walletClient: walletTwo } = await createWalletDaemonWithClient(t, {
+    name: "w2",
+  });
+
+  const { walletClient: walletThree } = await createWalletDaemonWithClient(t, {
+    name: "w3",
+  });
 
   {
-    const wallet = walletOne;
+    const walletClient = walletOne;
 
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -66,15 +74,16 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
       minimum_age: 9,
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
+    await makeTestPaymentV2(t, { walletClient, merchant, order });
+    await walletClient.call(
+      WalletApiOperation.TestingWaitTransactionsFinal,
+      {},
+    );
   }
 
   {
-    const wallet = walletTwo;
-
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient: walletTwo,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -87,15 +96,13 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
       fulfillment_url: "taler://fulfillment-success/thx",
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
+    await makeTestPaymentV2(t, { walletClient: walletTwo, merchant, order });
+    await walletTwo.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
   }
 
   {
-    const wallet = walletThree;
-
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient: walletThree,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -108,8 +115,8 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
       minimum_age: 9,
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
+    await makeTestPaymentV2(t, { walletClient: walletThree, merchant, order });
+    await walletThree.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
   }
 }
 
-- 
cgit v1.2.3