From 499e003ff8bfcb75a20619c65c4a03a73cb7a850 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 25 Aug 2022 18:34:25 +0200
Subject: specify bank access API separately in tests

---
 packages/taler-wallet-core/src/bank-api-client.ts     | 8 +++-----
 packages/taler-wallet-core/src/dbless.ts              | 3 ++-
 packages/taler-wallet-core/src/operations/testing.ts  | 2 ++
 packages/taler-wallet-core/src/operations/withdraw.ts | 2 ++
 packages/taler-wallet-core/src/wallet.ts              | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'packages/taler-wallet-core')

diff --git a/packages/taler-wallet-core/src/bank-api-client.ts b/packages/taler-wallet-core/src/bank-api-client.ts
index fa93409c5..c2de65982 100644
--- a/packages/taler-wallet-core/src/bank-api-client.ts
+++ b/packages/taler-wallet-core/src/bank-api-client.ts
@@ -197,10 +197,7 @@ export namespace BankApi {
     );
 
     logger.info(`response status ${resp.status}`);
-    const respJson = await readSuccessResponseJsonOrThrow(
-      resp,
-      codecForAny(),
-    );
+    const respJson = await readSuccessResponseJsonOrThrow(resp, codecForAny());
 
     // FIXME: We don't check the status here!
   }
@@ -214,7 +211,7 @@ export namespace BankApi {
       `accounts/${bankUser.username}/withdrawals/${wopi.withdrawal_id}/abort`,
       bank.baseUrl,
     );
-    await bank.http.postJson(
+    const resp = await bank.http.postJson(
       url.href,
       {},
       {
@@ -226,6 +223,7 @@ export namespace BankApi {
         },
       },
     );
+    await readSuccessResponseJsonOrThrow(resp, codecForAny());
   }
 }
 
diff --git a/packages/taler-wallet-core/src/dbless.ts b/packages/taler-wallet-core/src/dbless.ts
index 4669b0be7..3a775c3f1 100644
--- a/packages/taler-wallet-core/src/dbless.ts
+++ b/packages/taler-wallet-core/src/dbless.ts
@@ -111,12 +111,13 @@ export async function topupReserveWithDemobank(
   http: HttpRequestLibrary,
   reservePub: string,
   bankBaseUrl: string,
+  bankAccessApiBaseUrl: string,
   exchangeInfo: ExchangeInfo,
   amount: AmountString,
 ) {
   const bankHandle: BankServiceHandle = {
     baseUrl: bankBaseUrl,
-    bankAccessApiBaseUrl: "??", // FIXME!
+    bankAccessApiBaseUrl: bankAccessApiBaseUrl,
     http,
   };
   const bankUser = await BankApi.createRandomBankUser(bankHandle);
diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts
index bec8ec8f8..8d28c62f7 100644
--- a/packages/taler-wallet-core/src/operations/testing.ts
+++ b/packages/taler-wallet-core/src/operations/testing.ts
@@ -348,6 +348,7 @@ export async function runIntegrationTest(
   await withdrawTestBalance(ws, {
     amount: args.amountToWithdraw,
     bankBaseUrl: args.bankBaseUrl,
+    bankAccessApiBaseUrl: args.bankAccessApiBaseUrl,
     exchangeBaseUrl: args.exchangeBaseUrl,
   });
   await ws.runUntilDone();
@@ -376,6 +377,7 @@ export async function runIntegrationTest(
   await withdrawTestBalance(ws, {
     amount: Amounts.stringify(withdrawAmountTwo),
     bankBaseUrl: args.bankBaseUrl,
+    bankAccessApiBaseUrl: args.bankBaseUrl,
     exchangeBaseUrl: args.exchangeBaseUrl,
   });
 
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts
index f92ce5063..03ec9b61b 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -382,6 +382,8 @@ export async function getBankWithdrawalInfo(
     codecForWithdrawOperationStatusResponse(),
   );
 
+  logger.info(`bank withdrawal operation status: ${j2s(status)}`);
+
   return {
     amount: Amounts.parseOrThrow(status.amount),
     confirmTransferUrl: status.confirm_transfer_url,
diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts
index 3c83cea6e..8ae4b2b7b 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -740,6 +740,7 @@ async function dispatchRequestInternal(
       await withdrawTestBalance(ws, {
         amount: "TESTKUDOS:10",
         bankBaseUrl: "https://bank.test.taler.net/",
+        bankAccessApiBaseUrl: "https://bank.test.taler.net/",
         exchangeBaseUrl: "https://exchange.test.taler.net/",
       });
       return {};
-- 
cgit v1.2.3