1 files changed, 30 insertions, 19 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts b/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
index 8efac1fc1..bc53cb533 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
@@ -25,10 +25,11 @@ import {
   WalletCli,
   ExchangeServiceInterface,
   harnessHttpLib,
+  WalletClient,
 } from "../harness/harness.js";
 import {
-  createSimpleTestkudosEnvironment,
-  withdrawViaBank,
+  createSimpleTestkudosEnvironmentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 import {
   URL,
@@ -46,11 +47,11 @@ async function testRefundApiWithFulfillmentUrl(
   env: {
     merchant: MerchantServiceInterface;
     bank: BankServiceHandle;
-    wallet: WalletCli;
+    walletClient: WalletClient;
     exchange: ExchangeServiceInterface;
   },
 ): Promise<void> {
-  const { wallet, bank, exchange, merchant } = env;
+  const { walletClient, bank, exchange, merchant } = env;
 
   // Set up order.
   const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
@@ -75,7 +76,7 @@ async function testRefundApiWithFulfillmentUrl(
 
   // Make wallet pay for the order
 
-  let preparePayResult = await wallet.client.call(
+  let preparePayResult = await walletClient.call(
     WalletApiOperation.PreparePayForUri,
     {
       talerPayUri,
@@ -86,7 +87,7 @@ async function testRefundApiWithFulfillmentUrl(
     preparePayResult.status === PreparePayResultType.PaymentPossible,
   );
 
-  await wallet.client.call(WalletApiOperation.ConfirmPay, {
+  await walletClient.call(WalletApiOperation.ConfirmPay, {
     proposalId: preparePayResult.proposalId,
   });
 
@@ -98,7 +99,7 @@ async function testRefundApiWithFulfillmentUrl(
 
   t.assertTrue(orderStatus.order_status === "paid");
 
-  preparePayResult = await wallet.client.call(
+  preparePayResult = await walletClient.call(
     WalletApiOperation.PreparePayForUri,
     {
       talerPayUri,
@@ -136,7 +137,9 @@ async function testRefundApiWithFulfillmentUrl(
     preparePayResult.contractTermsHash,
   );
 
-  let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl.href);
+  let publicOrderStatusResp = await harnessHttpLib.fetch(
+    publicOrderStatusUrl.href,
+  );
   const respData = await publicOrderStatusResp.json();
   t.assertTrue(publicOrderStatusResp.status === 200);
   t.assertAmountEquals(respData.refund_amount, "TESTKUDOS:5");
@@ -158,11 +161,11 @@ async function testRefundApiWithFulfillmentMessage(
   env: {
     merchant: MerchantServiceInterface;
     bank: BankServiceHandle;
-    wallet: WalletCli;
+    walletClient: WalletClient;
     exchange: ExchangeServiceInterface;
   },
 ): Promise<void> {
-  const { wallet, bank, exchange, merchant } = env;
+  const { walletClient, bank, exchange, merchant } = env;
 
   // Set up order.
   const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
@@ -187,7 +190,7 @@ async function testRefundApiWithFulfillmentMessage(
 
   // Make wallet pay for the order
 
-  let preparePayResult = await wallet.client.call(
+  let preparePayResult = await walletClient.call(
     WalletApiOperation.PreparePayForUri,
     {
       talerPayUri,
@@ -198,7 +201,7 @@ async function testRefundApiWithFulfillmentMessage(
     preparePayResult.status === PreparePayResultType.PaymentPossible,
   );
 
-  await wallet.client.call(WalletApiOperation.ConfirmPay, {
+  await walletClient.call(WalletApiOperation.ConfirmPay, {
     proposalId: preparePayResult.proposalId,
   });
 
@@ -210,7 +213,7 @@ async function testRefundApiWithFulfillmentMessage(
 
   t.assertTrue(orderStatus.order_status === "paid");
 
-  preparePayResult = await wallet.client.call(
+  preparePayResult = await walletClient.call(
     WalletApiOperation.PreparePayForUri,
     {
       talerPayUri,
@@ -248,7 +251,9 @@ async function testRefundApiWithFulfillmentMessage(
     preparePayResult.contractTermsHash,
   );
 
-  let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl.href);
+  let publicOrderStatusResp = await harnessHttpLib.fetch(
+    publicOrderStatusUrl.href,
+  );
   let respData = await publicOrderStatusResp.json();
   console.log(respData);
   t.assertTrue(publicOrderStatusResp.status === 200);
@@ -272,22 +277,28 @@ async function testRefundApiWithFulfillmentMessage(
 export async function runMerchantRefundApiTest(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" });
+  const wres = await withdrawViaBankV2(t, {
+    walletClient,
+    bank,
+    exchange,
+    amount: "TESTKUDOS:20",
+  });
+  await wres.withdrawalFinishedCond;
 
   await testRefundApiWithFulfillmentUrl(t, {
-    wallet,
+    walletClient,
     bank,
     exchange,
     merchant,
   });
 
   await testRefundApiWithFulfillmentMessage(t, {
-    wallet,
+    walletClient,
     bank,
     exchange,
     merchant,