Merge branch 'master' into age-withdraw

1 files changed, 12 insertions, 5 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts b/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts
index 5a471b9aa..b4268ee42 100644
--- a/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts
+++ b/packages/taler-harness/src/integrationtests/test-denom-unoffered.ts
@@ -17,9 +17,13 @@
 /**
  * Imports.
  */
-import { PreparePayResultType, TalerErrorCode } from "@gnu-taler/taler-util";
+import {
+  MerchantApiClient,
+  PreparePayResultType,
+  TalerErrorCode,
+} from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
-import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
+import { GlobalTestState } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
@@ -46,13 +50,14 @@ export async function runDenomUnofferedTest(t: GlobalTestState) {
   // Effectively we completely reset the exchange,
   // but keep the exchange master public key.
 
+  await merchant.stop();
+
   await exchange.stop();
   await exchange.purgeDatabase();
   await exchange.purgeSecmodKeys();
   await exchange.start();
   await exchange.pingUntilAvailable();
 
-  await merchant.stop();
   await merchant.start();
   await merchant.pingUntilAvailable();
 
@@ -62,11 +67,13 @@ export async function runDenomUnofferedTest(t: GlobalTestState) {
     fulfillment_url: "taler://fulfillment-success/thx",
   };
 
-  const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
+
+  const orderResp = await merchantClient.createOrder({
     order: order,
   });
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });