get rid of deprecated bankBaseUrl in more places
This commit is contained in:
parent
15feebecfe
commit
da59c85d2d
@ -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,
|
||||
|
@ -73,7 +73,6 @@ export async function runWalletDblessTest(t: GlobalTestState) {
|
||||
http,
|
||||
reservePub: reserveKeyPair.pub,
|
||||
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
|
||||
bankBaseUrl: bank.baseUrl,
|
||||
exchangeInfo,
|
||||
});
|
||||
|
||||
|
@ -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)");
|
||||
}
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
};
|
||||
|
@ -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/",
|
||||
|
Loading…
Reference in New Issue
Block a user