diff options
Diffstat (limited to 'src/headless')
-rw-r--r-- | src/headless/helpers.ts | 9 | ||||
-rw-r--r-- | src/headless/taler-wallet-cli.ts | 24 |
2 files changed, 10 insertions, 23 deletions
diff --git a/src/headless/helpers.ts b/src/headless/helpers.ts index 47a0844bd..aa6fa9751 100644 --- a/src/headless/helpers.ts +++ b/src/headless/helpers.ts @@ -26,7 +26,6 @@ import { Wallet } from "../wallet"; import { MemoryBackend, BridgeIDBFactory, shimIndexedDB } from "idb-bridge"; import { openTalerDatabase } from "../db"; import { HttpRequestLibrary } from "../util/http"; -import * as amounts from "../util/amounts"; import { Bank } from "./bank"; import fs from "fs"; import { NodeThreadCryptoWorkerFactory } from "../crypto/workers/nodeThreadWorker"; @@ -36,6 +35,7 @@ import { NodeHttpLib } from "./NodeHttpLib"; import { Logger } from "../util/logging"; import { SynchronousCryptoWorkerFactory } from "../crypto/workers/synchronousWorker"; import { WithdrawalSourceType } from "../types/dbTypes"; +import { Amounts } from "../util/amounts"; const logger = new Logger("helpers.ts"); @@ -142,11 +142,7 @@ export async function withdrawTestBalance( bankBaseUrl = "https://bank.test.taler.net/", exchangeBaseUrl = "https://exchange.test.taler.net/", ): Promise<void> { - const reserveResponse = await myWallet.createReserve({ - amount: amounts.parseOrThrow(amount), - exchange: exchangeBaseUrl, - exchangeWire: "payto://unknown", - }); + const reserveResponse = await myWallet.acceptManualWithdrawal(exchangeBaseUrl, Amounts.parseOrThrow(amount)); const reservePub = reserveResponse.reservePub; @@ -176,6 +172,5 @@ export async function withdrawTestBalance( }); await bank.createReserve(bankUser, amount, reservePub, exchangePaytoUri); - await myWallet.confirmReserve({ reservePub: reserveResponse.reservePub }); await donePromise; } diff --git a/src/headless/taler-wallet-cli.ts b/src/headless/taler-wallet-cli.ts index c9264caea..5637732b3 100644 --- a/src/headless/taler-wallet-cli.ts +++ b/src/headless/taler-wallet-cli.ts @@ -367,9 +367,7 @@ exchangesCli }) .action(async (args) => { await withWallet(args, async (wallet) => { - await wallet.updateExchangeFromUrl( - args.exchangesAddCmd.url, - ); + await wallet.updateExchangeFromUrl(args.exchangesAddCmd.url); }); }); @@ -387,12 +385,12 @@ exchangesCli await withWallet(args, async (wallet) => { await wallet.acceptExchangeTermsOfService( args.exchangesAcceptTosCmd.url, - args.exchangesAcceptTosCmd.etag + args.exchangesAcceptTosCmd.etag, ); }); }); - exchangesCli +exchangesCli .subcommand("exchangesTosCmd", "tos", { help: "Show terms of service.", }) @@ -401,9 +399,7 @@ exchangesCli }) .action(async (args) => { await withWallet(args, async (wallet) => { - const tosResult = await wallet.getExchangeTos( - args.exchangesTosCmd.url, - ); + const tosResult = await wallet.getExchangeTos(args.exchangesTosCmd.url); console.log(JSON.stringify(tosResult, undefined, 2)); }); }); @@ -458,14 +454,10 @@ advancedCli console.log("exchange has no accounts"); return; } - const reserve = await wallet.createReserve({ - amount: Amounts.parseOrThrow(args.withdrawManually.amount), - exchangeWire: acct.payto_uri, - exchange: exchange.baseUrl, - }); - await wallet.confirmReserve({ - reservePub: reserve.reservePub, - }); + const reserve = await wallet.acceptManualWithdrawal( + exchange.baseUrl, + Amounts.parseOrThrow(args.withdrawManually.amount), + ); const completePaytoUri = addPaytoQueryParams(acct.payto_uri, { amount: args.withdrawManually.amount, message: `Taler top-up ${reserve.reservePub}`, |