Merge branch 'master' into age-withdraw

1 files changed, 26 insertions, 24 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-payment-fault.ts b/packages/taler-harness/src/integrationtests/test-payment-fault.ts
index c1438a419..e57427fac 100644
--- a/packages/taler-harness/src/integrationtests/test-payment-fault.ts
+++ b/packages/taler-harness/src/integrationtests/test-payment-fault.ts
@@ -22,27 +22,26 @@
  * Imports.
  */
 import {
-  GlobalTestState,
-  MerchantService,
-  ExchangeService,
-  setupDb,
-  BankService,
-  WalletCli,
-  MerchantPrivateApi,
-  getPayto,
-} from "../harness/harness.js";
+  BankAccessApiClient,
+  CoreApiResponse,
+  MerchantApiClient,
+} from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { defaultCoinConfig } from "../harness/denomStructures.js";
 import {
   FaultInjectedExchangeService,
   FaultInjectionRequestContext,
   FaultInjectionResponseContext,
 } from "../harness/faultInjection.js";
-import { CoreApiResponse } from "@gnu-taler/taler-util";
-import { defaultCoinConfig } from "../harness/denomStructures.js";
 import {
-  WalletApiOperation,
-  BankApi,
-  BankAccessApi,
-} from "@gnu-taler/taler-wallet-core";
+  BankService,
+  ExchangeService,
+  GlobalTestState,
+  MerchantService,
+  WalletCli,
+  getPayto,
+  setupDb,
+} from "../harness/harness.js";
 
 /**
  * Run test for basic, bank-integrated withdrawal.
@@ -114,22 +113,25 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
     paytoUris: [getPayto("merchant-default")],
   });
 
+  const merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl());
+
   console.log("setup done!");
 
   const wallet = new WalletCli(t);
 
   // Create withdrawal operation
 
-  const user = await BankApi.createRandomBankUser(bank);
-  const wop = await BankAccessApi.createWithdrawalOperation(
-    bank,
-    user,
+  const bankClient = new BankAccessApiClient(bank.bankAccessApiBaseUrl);
+
+  const user = await bankClient.createRandomBankUser();
+  const wop = await bankClient.createWithdrawalOperation(
+    user.username,
     "TESTKUDOS:20",
   );
 
@@ -151,7 +153,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
 
   // Confirm it
 
-  await BankApi.confirmWithdrawalOperation(bank, user, wop);
+  await bankClient.confirmWithdrawalOperation(user.username, wop);
 
   await wallet.runUntilDone();
 
@@ -161,7 +163,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
 
   // Set up order.
 
-  const orderResp = await MerchantPrivateApi.createOrder(merchant, "default", {
+  const orderResp = await merchantClient.createOrder({
     order: {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -169,7 +171,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
     },
   });
 
-  let orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  let orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });
 
@@ -218,7 +220,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
 
   // Check if payment was successful.
 
-  orderStatus = await MerchantPrivateApi.queryPrivateOrderStatus(merchant, {
+  orderStatus = await merchantClient.queryPrivateOrderStatus({
     orderId: orderResp.order_id,
   });