1 files changed, 48 insertions, 15 deletions
diff --git a/packages/taler-harness/src/integrationtests/test-fee-regression.ts b/packages/taler-harness/src/integrationtests/test-fee-regression.ts
index f164606c4..6ae7b5de8 100644
--- a/packages/taler-harness/src/integrationtests/test-fee-regression.ts
+++ b/packages/taler-harness/src/integrationtests/test-fee-regression.ts
@@ -17,6 +17,10 @@
 /**
  * Imports.
  */
+import {
+  TalerCorebankApiClient,
+  TalerMerchantApi,
+} from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import {
   BankService,
@@ -27,10 +31,10 @@ import {
   setupDb,
 } from "../harness/harness.js";
 import {
-  SimpleTestEnvironmentNg,
+  SimpleTestEnvironmentNg3,
   createWalletDaemonWithClient,
   makeTestPaymentV2,
-  withdrawViaBankV2,
+  withdrawViaBankV3,
 } from "../harness/helpers.js";
 
 /**
@@ -39,7 +43,7 @@ import {
  */
 export async function createMyTestkudosEnvironment(
   t: GlobalTestState,
-): Promise<SimpleTestEnvironmentNg> {
+): Promise<SimpleTestEnvironmentNg3> {
   const db = await setupDb(t);
 
   const bank = await BankService.create(t, {
@@ -63,18 +67,42 @@ export async function createMyTestkudosEnvironment(
     database: db.connStr,
   });
 
-  const exchangeBankAccount = await bank.createExchangeAccount(
-    "myexchange",
-    "x",
-  );
-  exchange.addBankAccount("1", exchangeBankAccount);
+  let receiverName = "Exchange";
+  let exchangeBankUsername = "exchange";
+  let exchangeBankPassword = "mypw";
+  let exchangePaytoUri = generateRandomPayto(exchangeBankUsername);
+
+  await exchange.addBankAccount("1", {
+    accountName: exchangeBankUsername,
+    accountPassword: exchangeBankPassword,
+    wireGatewayApiBaseUrl: new URL(
+      "accounts/exchange/taler-wire-gateway/",
+      bank.baseUrl,
+    ).href,
+    accountPaytoUri: exchangePaytoUri,
+  });
 
-  bank.setSuggestedExchange(exchange, exchangeBankAccount.accountPaytoUri);
+  bank.setSuggestedExchange(exchange, exchangePaytoUri);
 
   await bank.start();
 
   await bank.pingUntilAvailable();
 
+  const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl, {
+    auth: {
+      username: "admin",
+      password: "adminpw",
+    },
+  });
+
+  await bankClient.registerAccountExtended({
+    name: receiverName,
+    password: exchangeBankPassword,
+    username: exchangeBankUsername,
+    is_taler_exchange: true,
+    payto_uri: exchangePaytoUri,
+  });
+
   const coinCommon = {
     cipher: "RSA" as const,
     durationLegal: "3 years",
@@ -160,8 +188,13 @@ export async function createMyTestkudosEnvironment(
     merchant,
     walletClient,
     walletService,
-    bank,
-    exchangeBankAccount,
+    bankClient,
+    exchangeBankAccount: {
+      accountName: "",
+      accountPassword: "",
+      accountPaytoUri: "",
+      wireGatewayApiBaseUrl: "",
+    },
   };
 }
 
@@ -171,14 +204,14 @@ export async function createMyTestkudosEnvironment(
 export async function runFeeRegressionTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { walletClient, bank, exchange, merchant } =
+  const { walletClient, bankClient, exchange, merchant } =
     await createMyTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
-  const wres = await withdrawViaBankV2(t, {
+  const wres = await withdrawViaBankV3(t, {
     walletClient,
-    bank,
+    bankClient,
     exchange,
     amount: "TESTKUDOS:1.92",
   });
@@ -190,7 +223,7 @@ export async function runFeeRegressionTest(t: GlobalTestState) {
   // Make sure we really withdraw one 0.64 and one 1.28 coin.
   t.assertTrue(coins.coins.length === 2);
 
-  const order = {
+  const order: TalerMerchantApi.Order = {
     summary: "Buy me!",
     amount: "TESTKUDOS:1.30",
     fulfillment_url: "taler://fulfillment-success/thx",