Merge branch 'master' into age-withdraw

1 files changed, 16 insertions, 11 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-paywall-flow.ts b/packages/taler-harness/src/integrationtests/test-paywall-flow.ts
index 5f63d4fac..247ec9cad 100644
--- a/packages/taler-harness/src/integrationtests/test-paywall-flow.ts
+++ b/packages/taler-harness/src/integrationtests/test-paywall-flow.ts
@@ -17,14 +17,15 @@
 /**
  * Imports.
  */
-import { GlobalTestState, MerchantPrivateApi, harnessHttpLib } from "../harness/harness.js";
 import {
-  PreparePayResultType,
-  codecForMerchantOrderStatusUnpaid,
   ConfirmPayResultType,
+  MerchantApiClient,
+  PreparePayResultType,
   URL,
+  codecForMerchantOrderStatusUnpaid,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { GlobalTestState, harnessHttpLib } from "../harness/harness.js";
 import {
   createSimpleTestkudosEnvironmentV2,
   withdrawViaBankV2,
@@ -39,6 +40,8 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
   const { walletClient, bank, exchange, merchant } =
     await createSimpleTestkudosEnvironmentV2(t);
 
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
+
   // Withdraw digital cash into the wallet.
 
   const wres = await withdrawViaBankV2(t, {
@@ -59,7 +62,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
    * =========================================================================
    */
 
-  let orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  let orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -70,7 +73,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
 
   const firstOrderId = orderResp.order_id;
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
     sessionId: "mysession-one",
   });
@@ -82,7 +85,9 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
   t.assertTrue(orderStatus.already_paid_order_id === undefined);
   let publicOrderStatusUrl = new URL(orderStatus.order_status_url);
 
-  let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl.href);
+  let publicOrderStatusResp = await harnessHttpLib.fetch(
+    publicOrderStatusUrl.href,
+  );
 
   if (publicOrderStatusResp.status != 402) {
     throw Error(
@@ -142,7 +147,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
    * =========================================================================
    */
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
     sessionId: "mysession-two",
   });
@@ -169,7 +174,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
    * =========================================================================
    */
 
-  orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -181,7 +186,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
 
   const secondOrderId = orderResp.order_id;
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: secondOrderId,
     sessionId: "mysession-three",
   });
@@ -206,7 +211,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
 
   // The first order should now be paid under "mysession-three",
   // as the wallet did re-purchase detection
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: firstOrderId,
     sessionId: "mysession-three",
   });
@@ -215,7 +220,7 @@ export async function runPaywallFlowTest(t: GlobalTestState) {
 
   // Check that with a completely new session ID, the status would NOT
   // be paid.
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: firstOrderId,
     sessionId: "mysession-four",
   });