Merge branch 'master' into age-withdraw

1 files changed, 20 insertions, 22 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-exchange-management.ts b/packages/taler-harness/src/integrationtests/test-exchange-management.ts
index c67f861e1..9338a8988 100644
--- a/packages/taler-harness/src/integrationtests/test-exchange-management.ts
+++ b/packages/taler-harness/src/integrationtests/test-exchange-management.ts
@@ -18,30 +18,27 @@
  * Imports.
  */
 import {
-  GlobalTestState,
-  WalletCli,
-  setupDb,
-  BankService,
-  ExchangeService,
-  MerchantService,
-  getPayto,
-} from "../harness/harness.js";
-import {
-  WalletApiOperation,
-  BankApi,
-  BankAccessApi,
-} from "@gnu-taler/taler-wallet-core";
-import {
+  BankAccessApiClient,
   ExchangesListResponse,
-  URL,
   TalerErrorCode,
+  URL,
   j2s,
 } from "@gnu-taler/taler-util";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { defaultCoinConfig } from "../harness/denomStructures.js";
 import {
   FaultInjectedExchangeService,
   FaultInjectionResponseContext,
 } from "../harness/faultInjection.js";
-import { defaultCoinConfig } from "../harness/denomStructures.js";
+import {
+  BankService,
+  ExchangeService,
+  GlobalTestState,
+  MerchantService,
+  WalletCli,
+  getPayto,
+  setupDb,
+} from "../harness/harness.js";
 
 /**
  * Test if the wallet handles outdated exchange versions correctly.
@@ -105,13 +102,13 @@ export async function runExchangeManagementTest(
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
     paytoUris: [getPayto("merchant-default")],
   });
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
     paytoUris: [getPayto("minst1")],
@@ -266,10 +263,11 @@ export async function runExchangeManagementTest(
 
   // 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:10",
   );