Merge branch 'master' into age-withdraw

1 files changed, 8 insertions, 6 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-kyc.ts b/packages/taler-harness/src/integrationtests/test-kyc.ts
index 1f7358b66..319e8828f 100644
--- a/packages/taler-harness/src/integrationtests/test-kyc.ts
+++ b/packages/taler-harness/src/integrationtests/test-kyc.ts
@@ -18,7 +18,7 @@
  * Imports.
  */
 import {
-  BankAccessApiClient,
+  TalerCorebankApiClient,
   Duration,
   j2s,
   Logger,
@@ -34,7 +34,7 @@ import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js";
 import {
   BankService,
   ExchangeService,
-  getPayto,
+  generateRandomPayto,
   GlobalTestState,
   MerchantService,
   setupDb,
@@ -162,7 +162,7 @@ export async function createKycTestkudosEnvironment(
   await merchant.addInstanceWithWireAccount({
     id: "default",
     name: "Default Instance",
-    paytoUris: [getPayto("merchant-default")],
+    paytoUris: [generateRandomPayto("merchant-default")],
     defaultWireTransferDelay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ minutes: 1 }),
     ),
@@ -171,7 +171,7 @@ export async function createKycTestkudosEnvironment(
   await merchant.addInstanceWithWireAccount({
     id: "minst1",
     name: "minst1",
-    paytoUris: [getPayto("minst1")],
+    paytoUris: [generateRandomPayto("minst1")],
     defaultWireTransferDelay: Duration.toTalerProtocolDuration(
       Duration.fromSpec({ minutes: 1 }),
     ),
@@ -302,7 +302,7 @@ export async function runKycTest(t: GlobalTestState) {
 
   // Withdraw digital cash into the wallet.
 
-  const bankClient = new BankAccessApiClient(bank.bankAccessApiBaseUrl);
+  const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
 
   const amount = "TESTKUDOS:20";
   const user = await bankClient.createRandomBankUser();
@@ -331,7 +331,9 @@ export async function runKycTest(t: GlobalTestState) {
 
   // Confirm it
 
-  await bankClient.confirmWithdrawalOperation(user.username, wop);
+  await bankClient.confirmWithdrawalOperation(user.username, {
+    withdrawalOperationId: wop.withdrawal_id,
+  });
 
   const kycNotificationCond = walletClient.waitForNotificationCond((x) => {
     if (