harness: modernize some tests

1 files changed, 15 insertions, 9 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-payment-forgettable.ts b/packages/taler-harness/src/integrationtests/test-payment-forgettable.ts
index b66eda2f1..83f19e58e 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-forgettable.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-forgettable.ts
@@ -17,11 +17,12 @@
 /**
  * Imports.
  */
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { GlobalTestState } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
-  makeTestPayment,
+  createSimpleTestkudosEnvironmentV2,
+  makeTestPaymentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 /**
@@ -30,12 +31,17 @@ import {
 export async function runPaymentForgettableTest(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:20" });
+  await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:20",
+  });
 
   {
     const order = {
@@ -50,7 +56,7 @@ export async function runPaymentForgettableTest(t: GlobalTestState) {
       },
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
+    await makeTestPaymentV2(t, { walletClient, merchant, order });
   }
 
   console.log("testing with forgettable field without hash");
@@ -68,10 +74,10 @@ export async function runPaymentForgettableTest(t: GlobalTestState) {
       },
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
+    await makeTestPaymentV2(t, { walletClient, merchant, order });
   }
 
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 }
 
 runPaymentForgettableTest.suites = ["wallet", "merchant"];