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",
|
amount: "KUDOS:10",
|
||||||
bankAccessApiBaseUrl:
|
bankAccessApiBaseUrl:
|
||||||
"https://bank.demo.taler.net/demobanks/default/access-api/",
|
"https://bank.demo.taler.net/demobanks/default/access-api/",
|
||||||
bankBaseUrl: "",
|
|
||||||
exchangeInfo,
|
exchangeInfo,
|
||||||
http,
|
http,
|
||||||
reservePub: reserveKeyPair.pub,
|
reservePub: reserveKeyPair.pub,
|
||||||
@ -311,7 +310,6 @@ deploymentCli
|
|||||||
await topupReserveWithDemobank({
|
await topupReserveWithDemobank({
|
||||||
amount: "TESTKUDOS:10",
|
amount: "TESTKUDOS:10",
|
||||||
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/",
|
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/",
|
||||||
bankBaseUrl: "",
|
|
||||||
exchangeInfo,
|
exchangeInfo,
|
||||||
http,
|
http,
|
||||||
reservePub: reserveKeyPair.pub,
|
reservePub: reserveKeyPair.pub,
|
||||||
|
@ -73,7 +73,6 @@ export async function runWalletDblessTest(t: GlobalTestState) {
|
|||||||
http,
|
http,
|
||||||
reservePub: reserveKeyPair.pub,
|
reservePub: reserveKeyPair.pub,
|
||||||
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
|
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl,
|
||||||
bankBaseUrl: bank.baseUrl,
|
|
||||||
exchangeInfo,
|
exchangeInfo,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -20,9 +20,7 @@
|
|||||||
import { GlobalTestState } from "../harness/harness.js";
|
import { GlobalTestState } from "../harness/harness.js";
|
||||||
import { createSimpleTestkudosEnvironment } from "../harness/helpers.js";
|
import { createSimpleTestkudosEnvironment } from "../harness/helpers.js";
|
||||||
import { WalletApiOperation, BankApi } from "@gnu-taler/taler-wallet-core";
|
import { WalletApiOperation, BankApi } from "@gnu-taler/taler-wallet-core";
|
||||||
import {
|
import { AbsoluteTime, j2s, Logger } from "@gnu-taler/taler-util";
|
||||||
AbsoluteTime, j2s, Logger,
|
|
||||||
} from "@gnu-taler/taler-util";
|
|
||||||
|
|
||||||
const logger = new Logger("test-withdrawal-manual.ts");
|
const logger = new Logger("test-withdrawal-manual.ts");
|
||||||
|
|
||||||
@ -61,7 +59,7 @@ export async function runWithdrawalManualTest(t: GlobalTestState) {
|
|||||||
|
|
||||||
// Check that the request did not go into long-polling.
|
// Check that the request did not go into long-polling.
|
||||||
const duration = AbsoluteTime.difference(tStart, AbsoluteTime.now());
|
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)");
|
throw Error("withdrawal took too long (longpolling issue)");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1508,11 +1508,6 @@ export interface WithdrawTestBalanceRequest {
|
|||||||
forcedDenomSel?: ForcedDenomSel;
|
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.
|
* Request to the crypto worker to make a sync signature.
|
||||||
|
@ -57,10 +57,6 @@ export interface BankAccountBalanceResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface BankServiceHandle {
|
export interface BankServiceHandle {
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
readonly baseUrl: string;
|
|
||||||
readonly bankAccessApiBaseUrl: string;
|
readonly bankAccessApiBaseUrl: string;
|
||||||
readonly http: HttpRequestLibrary;
|
readonly http: HttpRequestLibrary;
|
||||||
}
|
}
|
||||||
@ -155,10 +151,9 @@ export namespace BankApi {
|
|||||||
debitAccountPayto: string;
|
debitAccountPayto: string;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
let maybeBaseUrl = bank.baseUrl;
|
|
||||||
let url = new URL(
|
let url = new URL(
|
||||||
`taler-wire-gateway/${params.exchangeBankAccount.accountName}/admin/add-incoming`,
|
`taler-wire-gateway/${params.exchangeBankAccount.accountName}/admin/add-incoming`,
|
||||||
maybeBaseUrl,
|
bank.bankAccessApiBaseUrl,
|
||||||
);
|
);
|
||||||
await bank.http.postJson(
|
await bank.http.postJson(
|
||||||
url.href,
|
url.href,
|
||||||
|
@ -112,7 +112,6 @@ export async function checkReserve(
|
|||||||
export interface TopupReserveWithDemobankArgs {
|
export interface TopupReserveWithDemobankArgs {
|
||||||
http: HttpRequestLibrary;
|
http: HttpRequestLibrary;
|
||||||
reservePub: string;
|
reservePub: string;
|
||||||
bankBaseUrl: string;
|
|
||||||
bankAccessApiBaseUrl: string;
|
bankAccessApiBaseUrl: string;
|
||||||
exchangeInfo: ExchangeInfo;
|
exchangeInfo: ExchangeInfo;
|
||||||
amount: AmountString;
|
amount: AmountString;
|
||||||
@ -122,7 +121,6 @@ export async function topupReserveWithDemobank(
|
|||||||
args: TopupReserveWithDemobankArgs,
|
args: TopupReserveWithDemobankArgs,
|
||||||
) {
|
) {
|
||||||
const {
|
const {
|
||||||
bankBaseUrl,
|
|
||||||
http,
|
http,
|
||||||
bankAccessApiBaseUrl,
|
bankAccessApiBaseUrl,
|
||||||
amount,
|
amount,
|
||||||
@ -130,7 +128,6 @@ export async function topupReserveWithDemobank(
|
|||||||
reservePub,
|
reservePub,
|
||||||
} = args;
|
} = args;
|
||||||
const bankHandle: BankServiceHandle = {
|
const bankHandle: BankServiceHandle = {
|
||||||
baseUrl: bankBaseUrl,
|
|
||||||
bankAccessApiBaseUrl: bankAccessApiBaseUrl,
|
bankAccessApiBaseUrl: bankAccessApiBaseUrl,
|
||||||
http,
|
http,
|
||||||
};
|
};
|
||||||
|
@ -220,7 +220,8 @@ export async function testWithGv() {
|
|||||||
await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
|
await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
|
||||||
amountToSpend: "KUDOS:1",
|
amountToSpend: "KUDOS:1",
|
||||||
amountToWithdraw: "KUDOS:3",
|
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/",
|
exchangeBaseUrl: "https://exchange.demo.taler.net/",
|
||||||
merchantBaseUrl: "https://backend.demo.taler.net/",
|
merchantBaseUrl: "https://backend.demo.taler.net/",
|
||||||
});
|
});
|
||||||
@ -242,7 +243,6 @@ export async function testWithLocal() {
|
|||||||
await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
|
await w.wallet.client.call(WalletApiOperation.RunIntegrationTest, {
|
||||||
amountToSpend: "TESTKUDOS:1",
|
amountToSpend: "TESTKUDOS:1",
|
||||||
amountToWithdraw: "TESTKUDOS:3",
|
amountToWithdraw: "TESTKUDOS:3",
|
||||||
bankBaseUrl: "http://localhost:8082/",
|
|
||||||
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/",
|
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/",
|
||||||
exchangeBaseUrl: "http://localhost:8081/",
|
exchangeBaseUrl: "http://localhost:8081/",
|
||||||
merchantBaseUrl: "http://localhost:8083/",
|
merchantBaseUrl: "http://localhost:8083/",
|
||||||
|
Loading…
Reference in New Issue
Block a user