harness: make more tests run against libeufin

1 files changed, 37 insertions, 19 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts b/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts
index 27e754b68..19f89ae2c 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts
@@ -22,6 +22,7 @@ import {
   ConfirmPayResultType,
   MerchantApiClient,
   PreparePayResultType,
+  TalerCorebankApiClient,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { URL } from "url";
@@ -31,8 +32,8 @@ import {
   FaultInjectedMerchantService,
 } from "../harness/faultInjection.js";
 import {
+    BankService,
   ExchangeService,
-  FakebankService,
   generateRandomPayto,
   GlobalTestState,
   harnessHttpLib,
@@ -41,8 +42,8 @@ import {
 } from "../harness/harness.js";
 import {
   createWalletDaemonWithClient,
-  FaultyMerchantTestEnvironment,
-  withdrawViaBankV2,
+  FaultyMerchantTestEnvironmentNg,
+  withdrawViaBankV3,
 } from "../harness/helpers.js";
 
 /**
@@ -51,10 +52,10 @@ import {
  */
 export async function createConfusedMerchantTestkudosEnvironment(
   t: GlobalTestState,
-): Promise<FaultyMerchantTestEnvironment> {
+): Promise<FaultyMerchantTestEnvironmentNg> {
   const db = await setupDb(t);
 
-  const bank = await FakebankService.create(t, {
+  const bank = await BankService.create(t, {
     allowRegistrations: true,
     currency: "TESTKUDOS",
     database: db.connStr,
@@ -83,21 +84,39 @@ export async function createConfusedMerchantTestkudosEnvironment(
     config.setString("exchange", "base_url", "http://localhost:9081/");
   });
 
-  const exchangeBankAccount = await bank.createExchangeAccount(
-    "myexchange",
-    "x",
-  );
-  exchange.addBankAccount("1", exchangeBankAccount);
+  let receiverName = "Exchange";
+  let exchangeBankUsername = "exchange";
+  let exchangeBankPassword = "mypw";
+  let exchangePaytoUri = generateRandomPayto(exchangeBankUsername);
 
-  bank.setSuggestedExchange(
-    faultyExchange,
-    exchangeBankAccount.accountPaytoUri,
-  );
+  await exchange.addBankAccount("1", {
+    accountName: exchangeBankUsername,
+    accountPassword: exchangeBankPassword,
+    wireGatewayApiBaseUrl: new URL("accounts/exchange/taler-wire-gateway/", bank.baseUrl).href,
+    accountPaytoUri: exchangePaytoUri,
+  });
+
+  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,
+  });
+
   exchange.addOfferedCoins(defaultCoinConfig);
 
   await exchange.start();
@@ -132,8 +151,7 @@ export async function createConfusedMerchantTestkudosEnvironment(
     exchange,
     merchant,
     walletClient,
-    bank,
-    exchangeBankAccount,
+    bankClient,
     faultyMerchant,
     faultyExchange,
   };
@@ -146,14 +164,14 @@ export async function createConfusedMerchantTestkudosEnvironment(
 export async function runMerchantExchangeConfusionTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { walletClient, bank, faultyExchange, faultyMerchant } =
+  const { walletClient, bankClient, faultyExchange, faultyMerchant } =
     await createConfusedMerchantTestkudosEnvironment(t);
 
   // Withdraw digital cash into the wallet.
 
-  const wres = await withdrawViaBankV2(t, {
+  const wres = await withdrawViaBankV3(t, {
     walletClient,
-    bank,
+    bankClient,
     exchange: faultyExchange,
     amount: "TESTKUDOS:20",
   });