Merge branch 'master' into age-withdraw

1 files changed, 13 insertions, 14 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-claim-loop.ts b/packages/taler-harness/src/integrationtests/test-claim-loop.ts
index 32706c28b..a424e0101 100644
--- a/packages/taler-harness/src/integrationtests/test-claim-loop.ts
+++ b/packages/taler-harness/src/integrationtests/test-claim-loop.ts
@@ -19,11 +19,12 @@
  */
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { URL } from "url";
-import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
+import { GlobalTestState } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
 } from "../harness/helpers.js";
+import { MerchantApiClient } from "@gnu-taler/taler-util";
 
 /**
  * Run test for the merchant's order lifecycle.
@@ -44,8 +45,10 @@ export async function runClaimLoopTest(t: GlobalTestState) {
     amount: "TESTKUDOS:20",
   });
 
+  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",
@@ -54,12 +57,9 @@ export async function runClaimLoopTest(t: GlobalTestState) {
   });
 
   // Query private order status before claiming it.
-  let orderStatusBefore = await MerchantPrivateApi.queryPrivateOrderStatus(
-    merchant,
-    {
-      orderId: orderResp.order_id,
-    },
-  );
+  let orderStatusBefore = await merchantClient.queryPrivateOrderStatus({
+    orderId: orderResp.order_id,
+  });
   t.assertTrue(orderStatusBefore.order_status === "unpaid");
   let statusUrlBefore = new URL(orderStatusBefore.order_status_url);
 
@@ -71,13 +71,12 @@ export async function runClaimLoopTest(t: GlobalTestState) {
   });
 
   // Query private order status after claiming it.
-  let orderStatusAfter = await MerchantPrivateApi.queryPrivateOrderStatus(
-    merchant,
-    {
-      orderId: orderResp.order_id,
-    },
-  );
+  let orderStatusAfter = await merchantClient.queryPrivateOrderStatus({
+    orderId: orderResp.order_id,
+  });
   t.assertTrue(orderStatusAfter.order_status === "claimed");
 
   await t.shutdown();
 }
+
+runClaimLoopTest.suites = ["merchant"];
\ No newline at end of file