taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

rename to corebank API

Browse Source
This commit is contained in:
Florian Dold 2023-10-06 14:42:32 +02:00
parent 851b2da39c
commit 97d7be7503
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
30 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/taler-harness/src/bench1.ts
View File

@ -98,7 +98,7 @@ export async function runBench1(configJson: any): Promise<void> {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
amount: b1conf.currency + ":" + withdrawAmount, amount: b1conf.currency + ":" + withdrawAmount,
bankAccessApiBaseUrl: b1conf.bank, corebankApiBaseUrl: b1conf.bank,
exchangeBaseUrl: b1conf.exchange, exchangeBaseUrl: b1conf.exchange,
}); });

2
packages/taler-harness/src/bench3.ts
View File

@ -109,7 +109,7 @@ export async function runBench3(configJson: any): Promise<void> {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
amount: b3conf.currency + ":" + withdrawAmount, amount: b3conf.currency + ":" + withdrawAmount,
bankAccessApiBaseUrl: b3conf.bank, corebankApiBaseUrl: b3conf.bank,
exchangeBaseUrl: b3conf.exchange, exchangeBaseUrl: b3conf.exchange,
}); });

10
packages/taler-harness/src/harness/harness.ts
View File

@ -650,7 +650,7 @@ export class FakebankService
return `http://localhost:${this.bankConfig.httpPort}/`; return `http://localhost:${this.bankConfig.httpPort}/`;
} }
get bankAccessApiBaseUrl(): string { get corebankApiBaseUrl(): string {
return this.baseUrl; return this.baseUrl;
} }
@ -691,7 +691,7 @@ export class FakebankService
"bank", "bank",
); );
await this.pingUntilAvailable(); await this.pingUntilAvailable();
const bankClient = new TalerCorebankApiClient(this.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(this.corebankApiBaseUrl);
for (const acc of this.accounts) { for (const acc of this.accounts) {
await bankClient.registerAccount(acc.accountName, acc.accountPassword); await bankClient.registerAccount(acc.accountName, acc.accountPassword);
} }
@ -798,7 +798,7 @@ export class LibeufinBankService
return `http://localhost:${this.bankConfig.httpPort}/`; return `http://localhost:${this.bankConfig.httpPort}/`;
} }
get bankAccessApiBaseUrl(): string { get corebankApiBaseUrl(): string {
return this.baseUrl; return this.baseUrl;
} }
@ -825,7 +825,7 @@ export class LibeufinBankService
"libeufin-bank-httpd", "libeufin-bank-httpd",
); );
await this.pingUntilAvailable(); await this.pingUntilAvailable();
const bankClient = new TalerCorebankApiClient(this.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(this.corebankApiBaseUrl);
for (const acc of this.accounts) { for (const acc of this.accounts) {
await bankClient.registerAccount(acc.accountName, acc.accountPassword); await bankClient.registerAccount(acc.accountName, acc.accountPassword);
} }
@ -841,7 +841,7 @@ export class LibeufinBankService
const useLibeufinBank = false; const useLibeufinBank = false;
export interface BankServiceHandle { export interface BankServiceHandle {
readonly bankAccessApiBaseUrl: string; readonly corebankApiBaseUrl: string;
readonly http: HttpRequestLibrary; readonly http: HttpRequestLibrary;
} }

2
packages/taler-harness/src/harness/helpers.ts
View File

@ -560,7 +560,7 @@ export async function withdrawViaBankV2(
): Promise<WithdrawViaBankResult> { ): Promise<WithdrawViaBankResult> {
const { walletClient: wallet, bank, exchange, amount } = p; const { walletClient: wallet, bank, exchange, amount } = p;
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const user = await bankClient.createRandomBankUser(); const user = await bankClient.createRandomBankUser();
const wop = await bankClient.createWithdrawalOperation(user.username, amount); const wop = await bankClient.createWithdrawalOperation(user.username, amount);

6
packages/taler-harness/src/index.ts
View File

@ -312,7 +312,7 @@ deploymentCli
const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http);
await topupReserveWithDemobank({ await topupReserveWithDemobank({
amount: "KUDOS:10", amount: "KUDOS:10",
bankAccessApiBaseUrl: corebankApiBaseUrl:
"https://bank.demo.taler.net/", "https://bank.demo.taler.net/",
exchangeInfo, exchangeInfo,
http, http,
@ -341,7 +341,7 @@ deploymentCli
const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http);
await topupReserveWithDemobank({ await topupReserveWithDemobank({
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: corebankApiBaseUrl:
"https://bank.test.taler.net/", "https://bank.test.taler.net/",
exchangeInfo, exchangeInfo,
http, http,
@ -371,7 +371,7 @@ deploymentCli
const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http); const exchangeInfo = await downloadExchangeInfo(exchangeBaseUrl, http);
await topupReserveWithDemobank({ await topupReserveWithDemobank({
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/", corebankApiBaseUrl: "http://localhost:8082/taler-bank-access/",
exchangeInfo, exchangeInfo,
http, http,
reservePub: reserveKeyPair.pub, reservePub: reserveKeyPair.pub,

2
packages/taler-harness/src/integrationtests/test-age-restrictions-merchant.ts
View File

@ -179,7 +179,7 @@ export async function runAgeRestrictionsMerchantTest(t: GlobalTestState) {
// Pay with coin from tipping // Pay with coin from tipping
{ {
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const mbu = await bankClient.createRandomBankUser(); const mbu = await bankClient.createRandomBankUser();
const tipReserveResp = await merchantClient.createTippingReserve({ const tipReserveResp = await merchantClient.createTippingReserve({
exchange_url: exchange.baseUrl, exchange_url: exchange.baseUrl,

2
packages/taler-harness/src/integrationtests/test-bank-api.ts
View File

@ -99,7 +99,7 @@ export async function runBankApiTest(t: GlobalTestState) {
console.log("setup done!"); console.log("setup done!");
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const bankUser = await bankClient.registerAccount("user1", "pw1"); const bankUser = await bankClient.registerAccount("user1", "pw1");

2
packages/taler-harness/src/integrationtests/test-exchange-deposit.ts
View File

@ -66,7 +66,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) {
await topupReserveWithDemobank({ await topupReserveWithDemobank({
http, http,
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeInfo, exchangeInfo,
reservePub: reserveKeyPair.pub, reservePub: reserveKeyPair.pub,
}); });

2
packages/taler-harness/src/integrationtests/test-exchange-management.ts
View File

@ -263,7 +263,7 @@ export async function runExchangeManagementTest(
// Create withdrawal operation // Create withdrawal operation
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const user = await bankClient.createRandomBankUser(); const user = await bankClient.createRandomBankUser();
const wop = await bankClient.createWithdrawalOperation( const wop = await bankClient.createWithdrawalOperation(

2
packages/taler-harness/src/integrationtests/test-exchange-purse.ts
View File

@ -79,7 +79,7 @@ export async function runExchangePurseTest(t: GlobalTestState) {
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
http, http,
reservePub: reserveKeyPair.pub, reservePub: reserveKeyPair.pub,
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeInfo, exchangeInfo,
}); });

2
packages/taler-harness/src/integrationtests/test-forced-selection.ts
View File

@ -38,7 +38,7 @@ export async function runForcedSelectionTest(t: GlobalTestState) {
await walletClient.call(WalletApiOperation.WithdrawTestBalance, { await walletClient.call(WalletApiOperation.WithdrawTestBalance, {
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
forcedDenomSel: { forcedDenomSel: {
denoms: [ denoms: [
{ {

2
packages/taler-harness/src/integrationtests/test-kyc.ts
View File

@ -302,7 +302,7 @@ export async function runKycTest(t: GlobalTestState) {
// Withdraw digital cash into the wallet. // Withdraw digital cash into the wallet.
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const amount = "TESTKUDOS:20"; const amount = "TESTKUDOS:20";
const user = await bankClient.createRandomBankUser(); const user = await bankClient.createRandomBankUser();

2
packages/taler-harness/src/integrationtests/test-libeufin-bank.ts
View File

@ -126,7 +126,7 @@ export async function runLibeufinBankTest(t: GlobalTestState) {
console.log("setup done!"); console.log("setup done!");
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
// register exchange bank account // register exchange bank account
await bankClient.registerAccountExtended({ await bankClient.registerAccountExtended({

2
packages/taler-harness/src/integrationtests/test-payment-fault.ts
View File

@ -127,7 +127,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) {
// Create withdrawal operation // Create withdrawal operation
const bankClient = new TalerCorebankApiClient(bank.bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(bank.corebankApiBaseUrl);
const user = await bankClient.createRandomBankUser(); const user = await bankClient.createRandomBankUser();
const wop = await bankClient.createWithdrawalOperation( const wop = await bankClient.createWithdrawalOperation(

2
packages/taler-harness/src/integrationtests/test-tipping.ts
View File

@ -39,7 +39,7 @@ export async function runTippingTest(t: GlobalTestState) {
await createSimpleTestkudosEnvironmentV2(t); await createSimpleTestkudosEnvironmentV2(t);
const bankAccessApiClient = new TalerCorebankApiClient( const bankAccessApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const mbu = await bankAccessApiClient.createRandomBankUser(); const mbu = await bankAccessApiClient.createRandomBankUser();

2
packages/taler-harness/src/integrationtests/test-wallet-dbless.ts
View File

@ -72,7 +72,7 @@ export async function runWalletDblessTest(t: GlobalTestState) {
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
http, http,
reservePub: reserveKeyPair.pub, reservePub: reserveKeyPair.pub,
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeInfo, exchangeInfo,
}); });

2
packages/taler-harness/src/integrationtests/test-wallet-notifications.ts
View File

@ -122,7 +122,7 @@ export async function runWalletNotificationsTest(t: GlobalTestState) {
}); });
const bankAccessApiClient = new TalerCorebankApiClient( const bankAccessApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const user = await bankAccessApiClient.createRandomBankUser(); const user = await bankAccessApiClient.createRandomBankUser();
bankAccessApiClient.setAuth(user); bankAccessApiClient.setAuth(user);

6
packages/taler-harness/src/integrationtests/test-wallettesting.ts
View File

@ -120,7 +120,7 @@ export async function runWallettestingTest(t: GlobalTestState) {
await wallet.client.call(WalletApiOperation.RunIntegrationTest, { await wallet.client.call(WalletApiOperation.RunIntegrationTest, {
amountToSpend: "TESTKUDOS:5", amountToSpend: "TESTKUDOS:5",
amountToWithdraw: "TESTKUDOS:10", amountToWithdraw: "TESTKUDOS:10",
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
merchantAuthToken: merchantAuthToken, merchantAuthToken: merchantAuthToken,
merchantBaseUrl: merchant.makeInstanceBaseUrl(), merchantBaseUrl: merchant.makeInstanceBaseUrl(),
@ -143,7 +143,7 @@ export async function runWallettestingTest(t: GlobalTestState) {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
}); });
@ -168,7 +168,7 @@ export async function runWallettestingTest(t: GlobalTestState) {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
}); });

2
packages/taler-harness/src/integrationtests/test-withdrawal-abort-bank.ts
View File

@ -34,7 +34,7 @@ export async function runWithdrawalAbortBankTest(t: GlobalTestState) {
// Create a withdrawal operation // Create a withdrawal operation
const bankAccessApiClient = new TalerCorebankApiClient( const bankAccessApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const user = await bankAccessApiClient.createRandomBankUser(); const user = await bankAccessApiClient.createRandomBankUser();
bankAccessApiClient.setAuth(user); bankAccessApiClient.setAuth(user);

2
packages/taler-harness/src/integrationtests/test-withdrawal-bank-integrated.ts
View File

@ -42,7 +42,7 @@ export async function runWithdrawalBankIntegratedTest(t: GlobalTestState) {
// Create a withdrawal operation // Create a withdrawal operation
const corebankApiClient = new TalerCorebankApiClient( const corebankApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const user = await corebankApiClient.createRandomBankUser(); const user = await corebankApiClient.createRandomBankUser();
corebankApiClient.setAuth(user); corebankApiClient.setAuth(user);

2
packages/taler-harness/src/integrationtests/test-withdrawal-fakebank.ts
View File

@ -80,7 +80,7 @@ export async function runWithdrawalFakebankTest(t: GlobalTestState) {
}); });
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
bankAccessApiBaseUrl: bank.bankAccessApiBaseUrl, corebankApiBaseUrl: bank.corebankApiBaseUrl,
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
}); });

2
packages/taler-harness/src/integrationtests/test-withdrawal-fees.ts
View File

@ -108,7 +108,7 @@ export async function runWithdrawalFeesTest(t: GlobalTestState) {
const amount = "TESTKUDOS:7.5"; const amount = "TESTKUDOS:7.5";
const bankAccessApiClient = new TalerCorebankApiClient( const bankAccessApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const user = await bankAccessApiClient.createRandomBankUser(); const user = await bankAccessApiClient.createRandomBankUser();
bankAccessApiClient.setAuth(user); bankAccessApiClient.setAuth(user);

2
packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts
View File

@ -102,7 +102,7 @@ export async function runWithdrawalHugeTest(t: GlobalTestState) {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
exchangeBaseUrl: exchange.baseUrl, exchangeBaseUrl: exchange.baseUrl,
amount: "TESTKUDOS:10000", amount: "TESTKUDOS:10000",
bankAccessApiBaseUrl: bank.baseUrl, corebankApiBaseUrl: bank.baseUrl,
}); });
await withdrawalFinishedCond; await withdrawalFinishedCond;

2
packages/taler-harness/src/integrationtests/test-withdrawal-manual.ts
View File

@ -42,7 +42,7 @@ export async function runWithdrawalManualTest(t: GlobalTestState) {
// Create a withdrawal operation // Create a withdrawal operation
const bankAccessApiClient = new TalerCorebankApiClient( const bankAccessApiClient = new TalerCorebankApiClient(
bank.bankAccessApiBaseUrl, bank.corebankApiBaseUrl,
); );
const user = await bankAccessApiClient.createRandomBankUser(); const user = await bankAccessApiClient.createRandomBankUser();

14
packages/taler-util/src/wallet-types.ts
View File

@ -1556,7 +1556,7 @@ export const codecForTestPayArgs = (): Codec<TestPayArgs> =>
export interface IntegrationTestArgs { export interface IntegrationTestArgs {
exchangeBaseUrl: string; exchangeBaseUrl: string;
bankAccessApiBaseUrl: string; corebankApiBaseUrl: string;
merchantBaseUrl: string; merchantBaseUrl: string;
merchantAuthToken?: string; merchantAuthToken?: string;
amountToWithdraw: string; amountToWithdraw: string;
@ -1570,12 +1570,12 @@ export const codecForIntegrationTestArgs = (): Codec<IntegrationTestArgs> =>
.property("merchantAuthToken", codecOptional(codecForString())) .property("merchantAuthToken", codecOptional(codecForString()))
.property("amountToSpend", codecForAmountString()) .property("amountToSpend", codecForAmountString())
.property("amountToWithdraw", codecForAmountString()) .property("amountToWithdraw", codecForAmountString())
.property("bankAccessApiBaseUrl", codecForAmountString()) .property("corebankApiBaseUrl", codecForAmountString())
.build("IntegrationTestArgs"); .build("IntegrationTestArgs");
export interface IntegrationTestV2Args { export interface IntegrationTestV2Args {
exchangeBaseUrl: string; exchangeBaseUrl: string;
bankAccessApiBaseUrl: string; corebankApiBaseUrl: string;
merchantBaseUrl: string; merchantBaseUrl: string;
merchantAuthToken?: string; merchantAuthToken?: string;
} }
@ -1585,7 +1585,7 @@ export const codecForIntegrationTestV2Args = (): Codec<IntegrationTestV2Args> =>
.property("exchangeBaseUrl", codecForString()) .property("exchangeBaseUrl", codecForString())
.property("merchantBaseUrl", codecForString()) .property("merchantBaseUrl", codecForString())
.property("merchantAuthToken", codecOptional(codecForString())) .property("merchantAuthToken", codecOptional(codecForString()))
.property("bankAccessApiBaseUrl", codecForAmountString()) .property("corebankApiBaseUrl", codecForAmountString())
.build("IntegrationTestV2Args"); .build("IntegrationTestV2Args");
export interface AddExchangeRequest { export interface AddExchangeRequest {
@ -1861,9 +1861,9 @@ export interface CoreApiResponseError {
export interface WithdrawTestBalanceRequest { export interface WithdrawTestBalanceRequest {
amount: string; amount: string;
/** /**
* Bank access API base URL. * Corebank API base URL.
*/ */
bankAccessApiBaseUrl: string; corebankApiBaseUrl: string;
exchangeBaseUrl: string; exchangeBaseUrl: string;
forcedDenomSel?: ForcedDenomSel; forcedDenomSel?: ForcedDenomSel;
} }
@ -1936,7 +1936,7 @@ export const codecForWithdrawTestBalance =
.property("amount", codecForString()) .property("amount", codecForString())
.property("exchangeBaseUrl", codecForString()) .property("exchangeBaseUrl", codecForString())
.property("forcedDenomSel", codecForAny()) .property("forcedDenomSel", codecForAny())
.property("bankAccessApiBaseUrl", codecForString()) .property("corebankApiBaseUrl", codecForString())
.build("WithdrawTestBalanceRequest"); .build("WithdrawTestBalanceRequest");
export interface SetCoinSuspendedRequest { export interface SetCoinSuspendedRequest {

4
packages/taler-wallet-cli/src/index.ts
View File

@ -1280,7 +1280,7 @@ advancedCli
await wallet.client.call(WalletApiOperation.RunIntegrationTest, { await wallet.client.call(WalletApiOperation.RunIntegrationTest, {
amountToSpend: "TESTKUDOS:1", amountToSpend: "TESTKUDOS:1",
amountToWithdraw: "TESTKUDOS:3", amountToWithdraw: "TESTKUDOS:3",
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/", corebankApiBaseUrl: "http://localhost:8082/taler-bank-access/",
exchangeBaseUrl: "http://localhost:8081/", exchangeBaseUrl: "http://localhost:8081/",
merchantBaseUrl: "http://localhost:8083/", merchantBaseUrl: "http://localhost:8083/",
}); });
@ -1507,7 +1507,7 @@ testCli.subcommand("withdrawKudos", "withdraw-kudos").action(async (args) => {
await withWallet(args, async (wallet) => { await withWallet(args, async (wallet) => {
await wallet.client.call(WalletApiOperation.WithdrawTestBalance, { await wallet.client.call(WalletApiOperation.WithdrawTestBalance, {
amount: "KUDOS:50", amount: "KUDOS:50",
bankAccessApiBaseUrl: corebankApiBaseUrl:
"https://bank.demo.taler.net/", "https://bank.demo.taler.net/",
exchangeBaseUrl: "https://exchange.demo.taler.net/", exchangeBaseUrl: "https://exchange.demo.taler.net/",
}); });

6
packages/taler-wallet-core/src/dbless.ts
View File

@ -109,7 +109,7 @@ export async function checkReserve(
export interface TopupReserveWithDemobankArgs { export interface TopupReserveWithDemobankArgs {
http: HttpRequestLibrary; http: HttpRequestLibrary;
reservePub: string; reservePub: string;
bankAccessApiBaseUrl: string; corebankApiBaseUrl: string;
exchangeInfo: ExchangeInfo; exchangeInfo: ExchangeInfo;
amount: AmountString; amount: AmountString;
} }
@ -117,8 +117,8 @@ export interface TopupReserveWithDemobankArgs {
export async function topupReserveWithDemobank( export async function topupReserveWithDemobank(
args: TopupReserveWithDemobankArgs, args: TopupReserveWithDemobankArgs,
) { ) {
const { http, bankAccessApiBaseUrl, amount, exchangeInfo, reservePub } = args; const { http, corebankApiBaseUrl, amount, exchangeInfo, reservePub } = args;
const bankClient = new TalerCorebankApiClient(bankAccessApiBaseUrl); const bankClient = new TalerCorebankApiClient(corebankApiBaseUrl);
const bankUser = await bankClient.createRandomBankUser(); const bankUser = await bankClient.createRandomBankUser();
const wopi = await bankClient.createWithdrawalOperation( const wopi = await bankClient.createWithdrawalOperation(
bankUser.username, bankUser.username,

14
packages/taler-wallet-core/src/operations/testing.ts
View File

@ -102,13 +102,13 @@ export async function withdrawTestBalance(
): Promise<void> { ): Promise<void> {
const amount = req.amount; const amount = req.amount;
const exchangeBaseUrl = req.exchangeBaseUrl; const exchangeBaseUrl = req.exchangeBaseUrl;
const bankAccessApiBaseUrl = req.bankAccessApiBaseUrl; const corebankApiBaseUrl = req.corebankApiBaseUrl;
logger.trace( logger.trace(
`Registering bank user, bank access base url ${bankAccessApiBaseUrl}`, `Registering bank user, bank access base url ${corebankApiBaseUrl}`,
); );
const corebankClient = new TalerCorebankApiClient(bankAccessApiBaseUrl); const corebankClient = new TalerCorebankApiClient(corebankApiBaseUrl);
const bankUser = await corebankClient.createRandomBankUser(); const bankUser = await corebankClient.createRandomBankUser();
logger.trace(`Registered bank user ${JSON.stringify(bankUser)}`); logger.trace(`Registered bank user ${JSON.stringify(bankUser)}`);
@ -287,7 +287,7 @@ export async function runIntegrationTest(
logger.info("withdrawing test balance"); logger.info("withdrawing test balance");
await withdrawTestBalance(ws, { await withdrawTestBalance(ws, {
amount: args.amountToWithdraw, amount: args.amountToWithdraw,
bankAccessApiBaseUrl: args.bankAccessApiBaseUrl, corebankApiBaseUrl: args.corebankApiBaseUrl,
exchangeBaseUrl: args.exchangeBaseUrl, exchangeBaseUrl: args.exchangeBaseUrl,
}); });
await waitUntilDone(ws); await waitUntilDone(ws);
@ -315,7 +315,7 @@ export async function runIntegrationTest(
await withdrawTestBalance(ws, { await withdrawTestBalance(ws, {
amount: Amounts.stringify(withdrawAmountTwo), amount: Amounts.stringify(withdrawAmountTwo),
bankAccessApiBaseUrl: args.bankAccessApiBaseUrl, corebankApiBaseUrl: args.corebankApiBaseUrl,
exchangeBaseUrl: args.exchangeBaseUrl, exchangeBaseUrl: args.exchangeBaseUrl,
}); });
@ -557,7 +557,7 @@ export async function runIntegrationTest2(
logger.info("withdrawing test balance"); logger.info("withdrawing test balance");
await withdrawTestBalance(ws, { await withdrawTestBalance(ws, {
amount: Amounts.stringify(amountToWithdraw), amount: Amounts.stringify(amountToWithdraw),
bankAccessApiBaseUrl: args.bankAccessApiBaseUrl, corebankApiBaseUrl: args.corebankApiBaseUrl,
exchangeBaseUrl: args.exchangeBaseUrl, exchangeBaseUrl: args.exchangeBaseUrl,
}); });
await waitUntilDone(ws); await waitUntilDone(ws);
@ -590,7 +590,7 @@ export async function runIntegrationTest2(
await withdrawTestBalance(ws, { await withdrawTestBalance(ws, {
amount: Amounts.stringify(withdrawAmountTwo), amount: Amounts.stringify(withdrawAmountTwo),
bankAccessApiBaseUrl: args.bankAccessApiBaseUrl, corebankApiBaseUrl: args.corebankApiBaseUrl,
exchangeBaseUrl: args.exchangeBaseUrl, exchangeBaseUrl: args.exchangeBaseUrl,
}); });

2
packages/taler-wallet-core/src/wallet.ts
View File

@ -1073,7 +1073,7 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>(
case WalletApiOperation.WithdrawTestkudos: { case WalletApiOperation.WithdrawTestkudos: {
await withdrawTestBalance(ws, { await withdrawTestBalance(ws, {
amount: "TESTKUDOS:10", amount: "TESTKUDOS:10",
bankAccessApiBaseUrl: "https://bank.test.taler.net/", corebankApiBaseUrl: "https://bank.test.taler.net/",
exchangeBaseUrl: "https://exchange.test.taler.net/", exchangeBaseUrl: "https://exchange.test.taler.net/",
}); });
return { return {

4
packages/taler-wallet-embedded/src/wallet-qjs.ts
View File

@ -278,7 +278,7 @@ 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",
bankAccessApiBaseUrl: corebankApiBaseUrl:
"https://bank.demo.taler.net/", "https://bank.demo.taler.net/",
exchangeBaseUrl: "https://exchange.demo.taler.net/", exchangeBaseUrl: "https://exchange.demo.taler.net/",
merchantBaseUrl: "https://backend.demo.taler.net/", merchantBaseUrl: "https://backend.demo.taler.net/",
@ -306,7 +306,7 @@ export async function testWithLocal(path: string) {
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",
bankAccessApiBaseUrl: "http://localhost:8082/taler-bank-access/", corebankApiBaseUrl: "http://localhost:8082/taler-bank-access/",
exchangeBaseUrl: "http://localhost:8081/", exchangeBaseUrl: "http://localhost:8081/",
merchantBaseUrl: "http://localhost:8083/", merchantBaseUrl: "http://localhost:8083/",
}); });