harness: remove deprecated testing APIs

1 files changed, 85 insertions, 42 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
index 919097deb..5ee35a377 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
@@ -31,9 +31,10 @@ import {
   WalletCli,
 } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
-  makeTestPayment,
+  createSimpleTestkudosEnvironmentV2,
+  createWalletDaemonWithClient,
+  makeTestPaymentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 /**
@@ -43,12 +44,12 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
   // Set up test environment
 
   const {
-    wallet: walletOne,
+    walletClient: walletClientOne,
     bank,
     exchange,
     merchant,
     exchangeBankAccount,
-  } = await createSimpleTestkudosEnvironment(
+  } = await createSimpleTestkudosEnvironmentV2(
     t,
     defaultCoinConfig.map((x) => x("TESTKUDOS")),
     {
@@ -63,14 +64,26 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
     },
   );
 
-  const walletTwo = new WalletCli(t, "walletTwo");
-  const walletThree = new WalletCli(t, "walletThree");
+  const { walletClient: walletClientTwo } = await createWalletDaemonWithClient(
+    t,
+    {
+      name: "w2",
+    },
+  );
+
+  const { walletClient: walletClientThree } =
+    await createWalletDaemonWithClient(t, {
+      name: "w3",
+    });
 
   {
-    const walletZero = new WalletCli(t, "walletZero");
+    const { walletClient: walletClientZero } =
+      await createWalletDaemonWithClient(t, {
+        name: "w0",
+      });
 
-    await withdrawViaBank(t, {
-      wallet: walletZero,
+    await withdrawViaBankV2(t, {
+      walletClient: walletClientZero,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -84,15 +97,22 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
       minimum_age: 9,
     };
 
-    await makeTestPayment(t, { wallet: walletZero, merchant, order });
-    await walletZero.runUntilDone();
+    await makeTestPaymentV2(t, {
+      walletClient: walletClientZero,
+      merchant,
+      order,
+    });
+    await walletClientZero.call(
+      WalletApiOperation.TestingWaitTransactionsFinal,
+      {},
+    );
   }
 
   {
-    const wallet = walletOne;
+    const walletClient = walletClientOne;
 
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -106,15 +126,18 @@ export async function runAgeRestrictionsMerchantTest(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;
+    const walletClient = walletClientTwo;
 
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -127,15 +150,18 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
       fulfillment_url: "taler://fulfillment-success/thx",
     };
 
-    await makeTestPayment(t, { wallet, merchant, order });
-    await wallet.runUntilDone();
+    await makeTestPaymentV2(t, { walletClient, merchant, order });
+    await walletClient.call(
+      WalletApiOperation.TestingWaitTransactionsFinal,
+      {},
+    );
   }
 
   {
-    const wallet = walletThree;
+    const walletClient = walletClientThree;
 
-    await withdrawViaBank(t, {
-      wallet,
+    await withdrawViaBankV2(t, {
+      walletClient,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
@@ -148,20 +174,21 @@ export async function runAgeRestrictionsMerchantTest(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,
+      {},
+    );
   }
 
   // Pay with coin from tipping
   {
     const mbu = await BankApi.createRandomBankUser(bank);
-    const tipReserveResp = await merchantClient.createTippingReserve(
-      {
-        exchange_url: exchange.baseUrl,
-        initial_balance: "TESTKUDOS:10",
-        wire_method: getWireMethodForTest(),
-      },
-    );
+    const tipReserveResp = await merchantClient.createTippingReserve({
+      exchange_url: exchange.baseUrl,
+      initial_balance: "TESTKUDOS:10",
+      wire_method: getWireMethodForTest(),
+    });
 
     t.assertDeepEqual(
       tipReserveResp.accounts[0].payto_uri,
@@ -189,17 +216,26 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
       next_url: "https://example.com/after-tip",
     });
 
-    const walletTipping = new WalletCli(t, "age-tipping");
+    const { walletClient: walletClientTipping } =
+      await createWalletDaemonWithClient(t, {
+        name: "age-tipping",
+      });
 
-    const ptr = await walletTipping.client.call(WalletApiOperation.PrepareReward, {
-      talerRewardUri: tip.taler_reward_uri,
-    });
+    const ptr = await walletClientTipping.call(
+      WalletApiOperation.PrepareReward,
+      {
+        talerRewardUri: tip.taler_reward_uri,
+      },
+    );
 
-    await walletTipping.client.call(WalletApiOperation.AcceptReward, {
+    await walletClientTipping.call(WalletApiOperation.AcceptReward, {
       walletRewardId: ptr.walletRewardId,
     });
 
-    await walletTipping.runUntilDone();
+    await walletClientTipping.call(
+      WalletApiOperation.TestingWaitTransactionsFinal,
+      {},
+    );
 
     const order = {
       summary: "Buy me!",
@@ -208,8 +244,15 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
       minimum_age: 9,
     };
 
-    await makeTestPayment(t, { wallet: walletTipping, merchant, order });
-    await walletTipping.runUntilDone();
+    await makeTestPaymentV2(t, {
+      walletClient: walletClientTipping,
+      merchant,
+      order,
+    });
+    await walletClientTipping.call(
+      WalletApiOperation.TestingWaitTransactionsFinal,
+      {},
+    );
   }
 }