Merge branch 'master' into age-withdraw

1 files changed, 12 insertions, 10 deletions

diff --git a/packages/taler-harness/src/harness/helpers.ts b/packages/taler-harness/src/harness/helpers.ts
index 9892e600b..8c1612457 100644
--- a/packages/taler-harness/src/harness/helpers.ts
+++ b/packages/taler-harness/src/harness/helpers.ts
@@ -25,7 +25,7 @@
  */
 import {
   AmountString,
-  BankAccessApiClient,
+  TalerCorebankApiClient,
   ConfirmPayResultType,
   Duration,
   Logger,
@@ -56,7 +56,7 @@ import {
   WalletClient,
   WalletService,
   WithAuthorization,
-  getPayto,
+  generateRandomPayto,
   setupDb,
   setupSharedDb,
 } from "./harness.js";
@@ -236,7 +236,7 @@ export async function useSharedTestkudosEnvironment(t: GlobalTestState) {
       await merchant.addInstanceWithWireAccount({
         id: "default",
         name: "Default Instance",
-        paytoUris: [getPayto("merchant-default")],
+        paytoUris: [generateRandomPayto("merchant-default")],
         defaultWireTransferDelay: Duration.toTalerProtocolDuration(
           Duration.fromSpec({ minutes: 1 }),
         ),
@@ -245,7 +245,7 @@ export async function useSharedTestkudosEnvironment(t: GlobalTestState) {
       await merchant.addInstanceWithWireAccount({
         id: "minst1",
         name: "minst1",
-        paytoUris: [getPayto("minst1")],
+        paytoUris: [generateRandomPayto("minst1")],
         defaultWireTransferDelay: Duration.toTalerProtocolDuration(
           Duration.fromSpec({ minutes: 1 }),
         ),
@@ -368,7 +368,7 @@ export async function createSimpleTestkudosEnvironmentV2(
   await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
-    paytoUris: [getPayto("merchant-default")],
+    paytoUris: [generateRandomPayto("merchant-default")],
     defaultWireTransferDelay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ minutes: 1 }),
     ),
@@ -377,7 +377,7 @@ export async function createSimpleTestkudosEnvironmentV2(
   await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
-    paytoUris: [getPayto("minst1")],
+    paytoUris: [generateRandomPayto("minst1")],
     defaultWireTransferDelay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ minutes: 1 }),
     ),
@@ -512,13 +512,13 @@ export async function createFaultInjectedMerchantTestkudosEnvironment(
   await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
-    paytoUris: [getPayto("merchant-default")],
+    paytoUris: [generateRandomPayto("merchant-default")],
   });
 
   await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
-    paytoUris: [getPayto("minst1")],
+    paytoUris: [generateRandomPayto("minst1")],
   });
 
   console.log("setup done!");
@@ -560,7 +560,7 @@ export async function withdrawViaBankV2(
 ): Promise<WithdrawViaBankResult> {
   const { walletClient: wallet, bank, exchange, amount } = p;
 
-  const bankClient = new BankAccessApiClient(bank.bankAccessApiBaseUrl);
+  const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
 
   const user = await bankClient.createRandomBankUser();
   const wop = await bankClient.createWithdrawalOperation(user.username, amount);
@@ -592,7 +592,9 @@ export async function withdrawViaBankV2(
 
   // Confirm it
 
-  await bankClient.confirmWithdrawalOperation(user.username, wop);
+  await bankClient.confirmWithdrawalOperation(user.username, {
+    withdrawalOperationId: wop.withdrawal_id,
+  });
 
   return {
     withdrawalFinishedCond,