[taler-wallet-core] branch master updated: get rid of deprecated bankBaseUrl in more places

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new da59c85d2 get rid of deprecated bankBaseUrl in more places
da59c85d2 is described below

commit da59c85d2da6541ba54578adb43db1e4bf12dafa
Author: Florian Dold <florian@dold.me>
AuthorDate: Sat Apr 22 18:36:56 2023 +0200

    get rid of deprecated bankBaseUrl in more places
---
 packages/taler-harness/src/index.ts                               | 2 --
 packages/taler-harness/src/integrationtests/test-wallet-dbless.ts | 1 -
 .../taler-harness/src/integrationtests/test-withdrawal-manual.ts  | 8 +++-----
 packages/taler-util/src/wallet-types.ts                           | 5 -----
 packages/taler-wallet-core/src/bank-api-client.ts                 | 7 +------
 packages/taler-wallet-core/src/dbless.ts                          | 3 ---
 packages/taler-wallet-embedded/src/wallet-qjs.ts                  | 4 ++--
 7 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/packages/taler-harness/src/index.ts 
b/packages/taler-harness/src/index.ts
index 287e1f5be..e8eb57fe9 100644
--- a/packages/taler-harness/src/index.ts
+++ b/packages/taler-harness/src/index.ts
@@ -281,7 +281,6 @@ deploymentCli
       amount: "KUDOS:10",
       bankAccessApiBaseUrl:
         "https://bank.demo.taler.net/demobanks/default/access-api/";,
-      bankBaseUrl: "",
       exchangeInfo,
       http,
       reservePub: reserveKeyPair.pub,
@@ -311,7 +310,6 @@ deploymentCli
     await topupReserveWithDemobank({
       amount: "TESTKUDOS:10",
       bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/";,
-      bankBaseUrl: "",
       exchangeInfo,
       http,
       reservePub: reserveKeyPair.pub,
diff --git a/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts 
b/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts
index 35c60a89d..37be9dcf8 100644
--- a/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts
+++ b/packages/taler-harness/src/integrationtests/test-wallet-dbless.ts
@@ -73,7 +73,6 @@ export async function runWalletDblessTest(t: GlobalTestState) 
{
       http,
       reservePub: reserveKeyPair.pub,
       bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
-      bankBaseUrl: bank.baseUrl,
       exchangeInfo,
     });
 
diff --git 
a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts 
b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
index d28ecc91c..260972498 100644
--- a/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
+++ b/packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
@@ -20,9 +20,7 @@
 import { GlobalTestState } from "../harness/harness.js";
 import { createSimpleTestkudosEnvironment } from "../harness/helpers.js";
 import { WalletApiOperation, BankApi } from "@gnu-taler/taler-wallet-core";
-import {
-  AbsoluteTime, j2s, Logger,
-} from "@gnu-taler/taler-util";
+import { AbsoluteTime, j2s, Logger } from "@gnu-taler/taler-util";
 
 const logger = new Logger("test-withdrawal-manual.ts");
 
@@ -47,7 +45,7 @@ export async function runWithdrawalManualTest(t: 
GlobalTestState) {
 
   logger.info("starting AcceptManualWithdrawal request");
   // We expect this to return immediately.
-  
+
   const wres = await wallet.client.call(
     WalletApiOperation.AcceptManualWithdrawal,
     {
@@ -61,7 +59,7 @@ export async function runWithdrawalManualTest(t: 
GlobalTestState) {
 
   // Check that the request did not go into long-polling.
   const duration = AbsoluteTime.difference(tStart, AbsoluteTime.now());
-  if (duration.d_ms > 5 * 1000) {
+  if (typeof duration.d_ms !== "number" || duration.d_ms > 5 * 1000) {
     throw Error("withdrawal took too long (longpolling issue)");
   }
 
diff --git a/packages/taler-util/src/wallet-types.ts 
b/packages/taler-util/src/wallet-types.ts
index 4297e838d..151934f2c 100644
--- a/packages/taler-util/src/wallet-types.ts
+++ b/packages/taler-util/src/wallet-types.ts
@@ -1508,11 +1508,6 @@ export interface WithdrawTestBalanceRequest {
   forcedDenomSel?: ForcedDenomSel;
 }
 
-export const withdrawTestBalanceDefaults = {
-  amount: "TESTKUDOS:10",
-  bankBaseUrl: "https://bank.test.taler.net/";,
-  exchangeBaseUrl: "https://exchange.test.taler.net/";,
-};
 
 /**
  * Request to the crypto worker to make a sync signature.
diff --git a/packages/taler-wallet-core/src/bank-api-client.ts 
b/packages/taler-wallet-core/src/bank-api-client.ts
index ac8eedc27..33f12172b 100644
--- a/packages/taler-wallet-core/src/bank-api-client.ts
+++ b/packages/taler-wallet-core/src/bank-api-client.ts
@@ -57,10 +57,6 @@ export interface BankAccountBalanceResponse {
 }
 
 export interface BankServiceHandle {
-  /**
-   * @deprecated
-   */
-  readonly baseUrl: string;
   readonly bankAccessApiBaseUrl: string;
   readonly http: HttpRequestLibrary;
 }
@@ -155,10 +151,9 @@ export namespace BankApi {
       debitAccountPayto: string;
     },
   ) {
-    let maybeBaseUrl = bank.baseUrl;
     let url = new URL(
       
`taler-wire-gateway/${params.exchangeBankAccount.accountName}/admin/add-incoming`,
-      maybeBaseUrl,
+      bank.bankAccessApiBaseUrl,
     );
     await bank.http.postJson(
       url.href,
diff --git a/packages/taler-wallet-core/src/dbless.ts 
b/packages/taler-wallet-core/src/dbless.ts
index 3fb56924d..87e3984b6 100644
--- a/packages/taler-wallet-core/src/dbless.ts
+++ b/packages/taler-wallet-core/src/dbless.ts
@@ -112,7 +112,6 @@ export async function checkReserve(
 export interface TopupReserveWithDemobankArgs {
   http: HttpRequestLibrary;
   reservePub: string;
-  bankBaseUrl: string;
   bankAccessApiBaseUrl: string;
   exchangeInfo: ExchangeInfo;
   amount: AmountString;
@@ -122,7 +121,6 @@ export async function topupReserveWithDemobank(
   args: TopupReserveWithDemobankArgs,
 ) {
   const {
-    bankBaseUrl,
     http,
     bankAccessApiBaseUrl,
     amount,
@@ -130,7 +128,6 @@ export async function topupReserveWithDemobank(
     reservePub,
   } = args;
   const bankHandle: BankServiceHandle = {
-    baseUrl: bankBaseUrl,
     bankAccessApiBaseUrl: bankAccessApiBaseUrl,
     http,
   };
diff --git a/packages/taler-wallet-embedded/src/wallet-qjs.ts 
b/packages/taler-wallet-embedded/src/wallet-qjs.ts
index 18f867f2e..654287a31 100644
--- a/packages/taler-wallet-embedded/src/wallet-qjs.ts
+++ b/packages/taler-wallet-embedded/src/wallet-qjs.ts
@@ -220,7 +220,8 @@ export async function testWithGv() {
   await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
     amountToSpend: "KUDOS:1",
     amountToWithdraw: "KUDOS:3",
-    bankBaseUrl: "https://bank.demo.taler.net/demobanks/default/access-api/";,
+    bankAccessApiBaseUrl:
+      "https://bank.demo.taler.net/demobanks/default/access-api/";,
     exchangeBaseUrl: "https://exchange.demo.taler.net/";,
     merchantBaseUrl: "https://backend.demo.taler.net/";,
   });
@@ -242,7 +243,6 @@ export async function testWithLocal() {
   await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
     amountToSpend: "TESTKUDOS:1",
     amountToWithdraw: "TESTKUDOS:3",
-    bankBaseUrl: "http://localhost:8082/";,
     bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/";,
     exchangeBaseUrl: "http://localhost:8081/";,
     merchantBaseUrl: "http://localhost:8083/";,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.