1 files changed, 17 insertions, 15 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 bc53cb533..ebca4f769 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-refund-api.ts
@@ -17,15 +17,13 @@
 /**
  * Imports.
  */
-import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
 import {
   GlobalTestState,
-  MerchantPrivateApi,
   MerchantServiceInterface,
-  WalletCli,
   ExchangeServiceInterface,
   harnessHttpLib,
   WalletClient,
+  MerchantApiClient,
 } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
@@ -51,10 +49,12 @@ async function testRefundApiWithFulfillmentUrl(
     exchange: ExchangeServiceInterface;
   },
 ): Promise<void> {
-  const { walletClient, bank, exchange, merchant } = env;
+  const { walletClient, merchant } = env;
+
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
 
   // Set up order.
-  const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  const orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -65,7 +65,7 @@ async function testRefundApiWithFulfillmentUrl(
     ),
   });
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -93,7 +93,7 @@ async function testRefundApiWithFulfillmentUrl(
 
   // Check if payment was successful.
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -110,14 +110,14 @@ async function testRefundApiWithFulfillmentUrl(
     preparePayResult.status === PreparePayResultType.AlreadyConfirmed,
   );
 
-  await MerchantPrivateApi.giveRefund(merchant, {
+  await merchantClient.giveRefund({
     amount: "TESTKUDOS:5",
     instance: "default",
     justification: "foo",
     orderId: orderResp.order_id,
   });
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -165,10 +165,12 @@ async function testRefundApiWithFulfillmentMessage(
     exchange: ExchangeServiceInterface;
   },
 ): Promise<void> {
-  const { walletClient, bank, exchange, merchant } = env;
+  const { walletClient, merchant } = env;
+
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
 
   // Set up order.
-  const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  const orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -179,7 +181,7 @@ async function testRefundApiWithFulfillmentMessage(
     ),
   });
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -207,7 +209,7 @@ async function testRefundApiWithFulfillmentMessage(
 
   // Check if payment was successful.
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -224,14 +226,14 @@ async function testRefundApiWithFulfillmentMessage(
     preparePayResult.status === PreparePayResultType.AlreadyConfirmed,
   );
 
-  await MerchantPrivateApi.giveRefund(merchant, {
+  await merchantClient.giveRefund({
     amount: "TESTKUDOS:5",
     instance: "default",
     justification: "foo",
     orderId: orderResp.order_id,
   });
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });