From 962bfde2144609f1911c967d93bbf88945ffe314 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Tue, 13 Sep 2022 17:41:47 +0200
Subject: wallet-core: fix withdrawTestBalance command

---
 packages/taler-util/src/walletTypes.ts               |  4 ++--
 packages/taler-wallet-core/src/operations/testing.ts | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/taler-util/src/walletTypes.ts b/packages/taler-util/src/walletTypes.ts
index c10e3be40..437ac2964 100644
--- a/packages/taler-util/src/walletTypes.ts
+++ b/packages/taler-util/src/walletTypes.ts
@@ -1166,7 +1166,7 @@ export interface WithdrawTestBalanceRequest {
   /**
    * Bank access API base URL.  Defaults to the bankBaseUrl.
    */
-  bankAccessApiBaseUrl: string;
+  bankAccessApiBaseUrl?: string;
   exchangeBaseUrl: string;
   forcedDenomSel?: ForcedDenomSel;
 }
@@ -1245,7 +1245,7 @@ export const codecForWithdrawTestBalance =
       .property("bankBaseUrl", codecForString())
       .property("exchangeBaseUrl", codecForString())
       .property("forcedDenomSel", codecForAny())
-      .property("bankAccessApiBaseUrl", codecForString())
+      .property("bankAccessApiBaseUrl", codecOptional(codecForString()))
       .build("WithdrawTestBalanceRequest");
 
 export interface ApplyRefundResponse {
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts
index e2a0c7dbd..598a88502 100644
--- a/packages/taler-wallet-core/src/operations/testing.ts
+++ b/packages/taler-wallet-core/src/operations/testing.ts
@@ -92,19 +92,17 @@ export async function withdrawTestBalance(
 ): Promise<void> {
   const amount = req.amount;
   const exchangeBaseUrl = req.exchangeBaseUrl;
+  const bankAccessApiBaseUrl = req.bankAccessApiBaseUrl ?? req.bankBaseUrl;
 
   logger.trace(
-    `Registered bank user, bank access base url ${req.bankAccessApiBaseUrl}`,
-  );
-  const bankUser = await registerRandomBankUser(
-    ws.http,
-    req.bankAccessApiBaseUrl,
+    `Registered bank user, bank access base url ${bankAccessApiBaseUrl}`,
   );
+  const bankUser = await registerRandomBankUser(ws.http, bankAccessApiBaseUrl);
   logger.trace(`Registered bank user ${JSON.stringify(bankUser)}`);
 
   const wresp = await createDemoBankWithdrawalUri(
     ws.http,
-    req.bankAccessApiBaseUrl,
+    bankAccessApiBaseUrl,
     bankUser,
     amount,
   );
@@ -117,7 +115,7 @@ export async function withdrawTestBalance(
 
   await confirmBankWithdrawalUri(
     ws.http,
-    req.bankAccessApiBaseUrl,
+    bankAccessApiBaseUrl,
     bankUser,
     wresp.withdrawal_id,
   );
-- 
cgit v1.2.3