From 9a1a3b350d4147243dbe2ecfcdcb846c0f3c6dcb Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 6 Sep 2023 11:23:33 +0200
Subject: harness: get rid of deprecated merchant API client

---
 .../src/integrationtests/test-payment-share.ts     | 28 ++++++++--------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-payment-share.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-payment-share.ts b/packages/taler-harness/src/integrationtests/test-payment-share.ts
index 156571372..c12140d06 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-share.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-share.ts
@@ -22,7 +22,7 @@ import {
   PreparePayResultType,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
-import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
+import { GlobalTestState, MerchantApiClient } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
   createWalletDaemonWithClient,
@@ -41,6 +41,8 @@ export async function runPaymentShareTest(t: GlobalTestState) {
     merchant,
   } = await createSimpleTestkudosEnvironmentV2(t);
 
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
+
   // Withdraw digital cash into the wallet.
   await withdrawViaBankV2(t, {
     walletClient: firstWallet,
@@ -62,7 +64,7 @@ export async function runPaymentShareTest(t: GlobalTestState) {
   });
   await secondWallet.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 
-  //create two orders to pay
+  // create two orders to pay
   async function createOrder(amount: string) {
     const order = {
       summary: "Buy me!",
@@ -70,26 +72,16 @@ export async function runPaymentShareTest(t: GlobalTestState) {
       fulfillment_url: "taler://fulfillment-success/thx",
     };
 
-    const instance = "default";
     const args = { order };
     const auth = {};
 
-    const orderResp = await MerchantPrivateApi.createOrder(
-      merchant,
-      instance,
-      {
-        order: args.order,
-      },
-      auth,
-    );
+    const orderResp = await merchantClient.createOrder({
+      order: args.order,
+    });
 
-    const orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(
-      merchant,
-      {
-        orderId: orderResp.order_id,
-      },
-      auth,
-    );
+    const orderStatus = await merchantClient.queryPrivateOrderStatus({
+      orderId: orderResp.order_id,
+    });
 
     t.assertTrue(orderStatus.order_status === "unpaid");
     return { id: orderResp.order_id, uri: orderStatus.taler_pay_uri };
-- 
cgit v1.2.3