Merge branch 'master' into age-withdraw

1 files changed, 15 insertions, 22 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-payment-transient.ts b/packages/taler-harness/src/integrationtests/test-payment-transient.ts
index 33a9716d5..c2a8e37c5 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-transient.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-transient.ts
@@ -17,23 +17,22 @@
 /**
  * Imports.
  */
-import { GlobalTestState, MerchantPrivateApi } from "../harness/harness.js";
 import {
-  withdrawViaBank,
-  createFaultInjectedMerchantTestkudosEnvironment,
-} from "../harness/helpers.js";
-import { FaultInjectionResponseContext } from "../harness/faultInjection.js";
-import {
-  codecForMerchantOrderStatusUnpaid,
   ConfirmPayResultType,
   PreparePayResultType,
   TalerErrorCode,
   TalerErrorDetail,
   URL,
+  codecForMerchantOrderStatusUnpaid,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
-import axiosImp from "axios";
-const axios = axiosImp.default;
+import { FaultInjectionResponseContext } from "../harness/faultInjection.js";
+import { GlobalTestState, MerchantPrivateApi, harnessHttpLib } from "../harness/harness.js";
+import {
+  createFaultInjectedMerchantTestkudosEnvironment,
+  withdrawViaBank,
+} from "../harness/helpers.js";
+
 
 /**
  * Run test for a payment where the merchant has a transient
@@ -75,9 +74,7 @@ export async function runPaymentTransientTest(t: GlobalTestState) {
   t.assertTrue(orderStatus.already_paid_order_id === undefined);
   let publicOrderStatusUrl = orderStatus.order_status_url;
 
-  let publicOrderStatusResp = await axios.get(publicOrderStatusUrl, {
-    validateStatus: () => true,
-  });
+  let publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl);
 
   if (publicOrderStatusResp.status != 402) {
     throw Error(
@@ -86,7 +83,7 @@ export async function runPaymentTransientTest(t: GlobalTestState) {
   }
 
   let pubUnpaidStatus = codecForMerchantOrderStatusUnpaid().decode(
-    publicOrderStatusResp.data,
+    publicOrderStatusResp.json(),
   );
 
   console.log(pubUnpaidStatus);
@@ -102,9 +99,7 @@ export async function runPaymentTransientTest(t: GlobalTestState) {
 
   const proposalId = preparePayResp.proposalId;
 
-  publicOrderStatusResp = await axios.get(publicOrderStatusUrl, {
-    validateStatus: () => true,
-  });
+  publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl);
 
   if (publicOrderStatusResp.status != 402) {
     throw Error(
@@ -113,7 +108,7 @@ export async function runPaymentTransientTest(t: GlobalTestState) {
   }
 
   pubUnpaidStatus = codecForMerchantOrderStatusUnpaid().decode(
-    publicOrderStatusResp.data,
+    publicOrderStatusResp.json(),
   );
 
   let faultInjected = false;
@@ -165,14 +160,12 @@ export async function runPaymentTransientTest(t: GlobalTestState) {
   // Now ask the merchant if paid
 
   console.log("requesting", publicOrderStatusUrl);
-  publicOrderStatusResp = await axios.get(publicOrderStatusUrl, {
-    validateStatus: () => true,
-  });
+  publicOrderStatusResp = await harnessHttpLib.fetch(publicOrderStatusUrl);
 
-  console.log(publicOrderStatusResp.data);
+  console.log(publicOrderStatusResp.json());
 
   if (publicOrderStatusResp.status != 200) {
-    console.log(publicOrderStatusResp.data);
+    console.log(publicOrderStatusResp.json());
     throw Error(
       `expected status 200 (after paying), but got ${publicOrderStatusResp.status}`,
     );