1 files changed, 25 insertions, 20 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts b/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
index f03b63f50..d87278197 100644
--- a/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
+++ b/packages/taler-harness/src/integrationtests/test-libeufin-basic.ts
@@ -19,23 +19,24 @@
  */
 import {
   AbsoluteTime,
-  MerchantContractTerms,
   Duration,
+  MerchantContractTerms,
 } from "@gnu-taler/taler-util";
-import {
-  WalletApiOperation,
-  HarnessExchangeBankAccount,
-} from "@gnu-taler/taler-wallet-core";
+import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
 import {
   DbInfo,
   ExchangeService,
   GlobalTestState,
+  HarnessExchangeBankAccount,
   MerchantService,
+  WalletClient,
   setupDb,
-  WalletCli,
 } from "../harness/harness.js";
-import { makeTestPayment } from "../harness/helpers.js";
+import {
+  createWalletDaemonWithClient,
+  makeTestPaymentV2,
+} from "../harness/helpers.js";
 import {
   LibeufinNexusApi,
   LibeufinNexusService,
@@ -53,7 +54,7 @@ export interface LibeufinTestEnvironment {
   exchange: ExchangeService;
   exchangeBankAccount: HarnessExchangeBankAccount;
   merchant: MerchantService;
-  wallet: WalletCli;
+  walletClient: WalletClient;
   libeufinSandbox: LibeufinSandboxService;
   libeufinNexus: LibeufinNexusService;
 }
@@ -69,7 +70,7 @@ export async function createLibeufinTestEnvironment(
 
   const libeufinSandbox = await LibeufinSandboxService.create(t, {
     httpPort: 5010,
-    databaseJdbcUri: `jdbc:sqlite:${t.testDir}/libeufin-sandbox.sqlite3`,
+    databaseJdbcUri: db.connStr,
   });
 
   await libeufinSandbox.start();
@@ -77,7 +78,7 @@ export async function createLibeufinTestEnvironment(
 
   const libeufinNexus = await LibeufinNexusService.create(t, {
     httpPort: 5011,
-    databaseJdbcUri: `jdbc:sqlite:${t.testDir}/libeufin-nexus.sqlite3`,
+    databaseJdbcUri: db.connStr,
   });
 
   await libeufinNexus.start();
@@ -202,7 +203,7 @@ export async function createLibeufinTestEnvironment(
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
+  await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
     paytoUris: [`payto://iban/${merchantIban}?receiver-name=Merchant`],
@@ -213,13 +214,15 @@ export async function createLibeufinTestEnvironment(
 
   console.log("setup done!");
 
-  const wallet = new WalletCli(t);
+  const { walletClient } = await createWalletDaemonWithClient(t, {
+    name: "default",
+  });
 
   return {
     commonDb: db,
     exchange,
     merchant,
-    wallet,
+    walletClient,
     exchangeBankAccount,
     libeufinNexus,
     libeufinSandbox,
@@ -232,14 +235,14 @@ export async function createLibeufinTestEnvironment(
 export async function runLibeufinBasicTest(t: GlobalTestState) {
   // Set up test environment
 
-  const { wallet, exchange, merchant, libeufinSandbox, libeufinNexus } =
+  const { walletClient, exchange, merchant, libeufinSandbox, libeufinNexus } =
     await createLibeufinTestEnvironment(t);
 
-  await wallet.client.call(WalletApiOperation.AddExchange, {
+  await walletClient.call(WalletApiOperation.AddExchange, {
     exchangeBaseUrl: exchange.baseUrl,
   });
 
-  const wr = await wallet.client.call(
+  const wr = await walletClient.call(
     WalletApiOperation.AcceptManualWithdrawal,
     {
       exchangeBaseUrl: exchange.baseUrl,
@@ -265,9 +268,9 @@ export async function runLibeufinBasicTest(t: GlobalTestState) {
 
   await exchange.runWirewatchOnce();
 
-  await wallet.runUntilDone();
+  await walletClient.call(WalletApiOperation.TestingWaitTransactionsFinal, {});
 
-  const bal = await wallet.client.call(WalletApiOperation.GetBalances, {});
+  const bal = await walletClient.call(WalletApiOperation.GetBalances, {});
   console.log("balances", JSON.stringify(bal, undefined, 2));
   t.assertAmountEquals(bal.balances[0].available, "EUR:14.7");
 
@@ -275,10 +278,12 @@ export async function runLibeufinBasicTest(t: GlobalTestState) {
     summary: "Buy me!",
     amount: "EUR:5",
     fulfillment_url: "taler://fulfillment-success/thx",
-    wire_transfer_deadline: AbsoluteTime.toProtocolTimestamp(AbsoluteTime.now()),
+    wire_transfer_deadline: AbsoluteTime.toProtocolTimestamp(
+      AbsoluteTime.now(),
+    ),
   };
 
-  await makeTestPayment(t, { wallet, merchant, order });
+  await makeTestPaymentV2(t, { walletClient, merchant, order });
 
   await exchange.runAggregatorOnce();
   await exchange.runTransferOnce();