From bb369f2e2ab7838751ce9aae2e23622be1391586 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Sep 2020 19:07:14 +0530 Subject: auto-format --- packages/taler-wallet-core/src/TalerErrorCode.ts | 3 -- .../src/crypto/workers/cryptoApi.ts | 5 +-- .../taler-wallet-core/src/headless/NodeHttpLib.ts | 3 +- packages/taler-wallet-core/src/i18n/index.ts | 7 ++-- packages/taler-wallet-core/src/index.ts | 2 +- .../taler-wallet-core/src/operations/refund.ts | 7 +++- packages/taler-wallet-core/src/operations/state.ts | 2 +- .../taler-wallet-core/src/operations/testing.ts | 11 +++++-- .../src/operations/transactions.ts | 2 +- .../taler-wallet-core/src/operations/withdraw.ts | 6 +++- packages/taler-wallet-core/src/types/dbTypes.ts | 2 +- packages/taler-wallet-core/src/types/talerTypes.ts | 38 +++++++++++++--------- .../taler-wallet-core/src/types/walletTypes.ts | 10 ++++-- .../taler-wallet-core/src/util/RequestThrottler.ts | 2 +- packages/taler-wallet-core/src/util/http.ts | 2 +- packages/taler-wallet-core/src/util/query.ts | 1 - packages/taler-wallet-core/src/wallet.ts | 1 - 17 files changed, 64 insertions(+), 40 deletions(-) (limited to 'packages/taler-wallet-core/src') diff --git a/packages/taler-wallet-core/src/TalerErrorCode.ts b/packages/taler-wallet-core/src/TalerErrorCode.ts index a4c4b5a62..8a020b9da 100644 --- a/packages/taler-wallet-core/src/TalerErrorCode.ts +++ b/packages/taler-wallet-core/src/TalerErrorCode.ts @@ -22,8 +22,6 @@ */ export enum TalerErrorCode { - - /** * Special code to indicate no error (or no "code" present). * Returned with an HTTP status code of #MHD_HTTP_UNINITIALIZED (0). @@ -3278,5 +3276,4 @@ export enum TalerErrorCode { * (A value of 0 indicates that the error is generated client-side). */ END = 9999, - } diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts index 7d322877a..44de6b674 100644 --- a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts +++ b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts @@ -203,10 +203,7 @@ export class CryptoApi { handleWorkerError(ws: WorkerState, e: any): void { if (ws.currentWorkItem) { - logger.error( - `error in worker during ${ws.currentWorkItem.operation}`, - e, - ); + logger.error(`error in worker during ${ws.currentWorkItem.operation}`, e); } else { logger.error("error in worker", e); } diff --git a/packages/taler-wallet-core/src/headless/NodeHttpLib.ts b/packages/taler-wallet-core/src/headless/NodeHttpLib.ts index 62ab9caf6..4fefb5aef 100644 --- a/packages/taler-wallet-core/src/headless/NodeHttpLib.ts +++ b/packages/taler-wallet-core/src/headless/NodeHttpLib.ts @@ -63,7 +63,8 @@ export class NodeHttpLib implements HttpRequestLibrary { requestMethod: method, requestUrl: url, throttleStats: this.throttle.getThrottleStats(url), - }); + }, + ); } let timeout: number | undefined; if (typeof opt?.timeout?.d_ms === "number") { diff --git a/packages/taler-wallet-core/src/i18n/index.ts b/packages/taler-wallet-core/src/i18n/index.ts index b8788115c..a820eaeb1 100644 --- a/packages/taler-wallet-core/src/i18n/index.ts +++ b/packages/taler-wallet-core/src/i18n/index.ts @@ -85,6 +85,9 @@ export function str(stringSeq: TemplateStringsArray, ...values: any[]): string { * from a JSON object. Fall back to the default language of the JSON object * if no match exists. */ -export function getJsonI18n(obj: Record, key: K): string { +export function getJsonI18n( + obj: Record, + key: K, +): string { return obj[key]; -} \ No newline at end of file +} diff --git a/packages/taler-wallet-core/src/index.ts b/packages/taler-wallet-core/src/index.ts index 193152abe..8d5d46b4f 100644 --- a/packages/taler-wallet-core/src/index.ts +++ b/packages/taler-wallet-core/src/index.ts @@ -63,4 +63,4 @@ export * from "./util/time"; export * from "./types/talerTypes"; export * from "./types/walletTypes"; export * from "./types/notifications"; -export * from "./types/transactions" +export * from "./types/transactions"; diff --git a/packages/taler-wallet-core/src/operations/refund.ts b/packages/taler-wallet-core/src/operations/refund.ts index 2c7427c03..787d2bb4c 100644 --- a/packages/taler-wallet-core/src/operations/refund.ts +++ b/packages/taler-wallet-core/src/operations/refund.ts @@ -260,7 +260,12 @@ async function acceptRefunds( const refreshCoinsPubs = Object.values(refreshCoinsMap); if (refreshCoinsPubs.length > 0) { - await createRefreshGroup(ws, tx, refreshCoinsPubs, RefreshReason.Refund); + await createRefreshGroup( + ws, + tx, + refreshCoinsPubs, + RefreshReason.Refund, + ); } // Are we done with querying yet, or do we need to do another round diff --git a/packages/taler-wallet-core/src/operations/state.ts b/packages/taler-wallet-core/src/operations/state.ts index 131e9083d..c4d5b38f1 100644 --- a/packages/taler-wallet-core/src/operations/state.ts +++ b/packages/taler-wallet-core/src/operations/state.ts @@ -82,7 +82,7 @@ export class InternalWalletState { */ async runSequentialized(tokens: string[], f: () => Promise) { // Make sure locks are always acquired in the same order - tokens = [... tokens].sort(); + tokens = [...tokens].sort(); for (const token of tokens) { if (this.resourceLocks.has(token)) { diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index f1b2d98ff..0a83773ab 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -33,7 +33,11 @@ import { Wallet } from "../wallet"; import { Amounts } from "../util/amounts"; import { NodeHttpLib } from "../headless/NodeHttpLib"; import { getDefaultNodeWallet } from "../headless/helpers"; -import { TestPayArgs, PreparePayResultType, IntegrationTestArgs } from "../types/walletTypes"; +import { + TestPayArgs, + PreparePayResultType, + IntegrationTestArgs, +} from "../types/walletTypes"; const logger = new Logger("operations/testing.ts"); @@ -410,7 +414,10 @@ export async function testPay( args: TestPayArgs, ) { logger.trace("creating order"); - const merchant = { apikey: args.merchantApiKey, baseUrl: args.merchantBaseUrl }; + const merchant = { + apikey: args.merchantApiKey, + baseUrl: args.merchantBaseUrl, + }; const orderResp = await createOrder( http, merchant, diff --git a/packages/taler-wallet-core/src/operations/transactions.ts b/packages/taler-wallet-core/src/operations/transactions.ts index 3115b9506..cc569fd24 100644 --- a/packages/taler-wallet-core/src/operations/transactions.ts +++ b/packages/taler-wallet-core/src/operations/transactions.ts @@ -165,7 +165,7 @@ export async function getTransactions( TransactionType.Withdrawal, wsr.withdrawalGroupId, ), - ...(wsr.lastError ? { error: wsr.lastError} : {}), + ...(wsr.lastError ? { error: wsr.lastError } : {}), }); } break; diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index 2ab1ea52d..c68f1521f 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -48,7 +48,11 @@ import { updateExchangeFromUrl, getExchangeTrust } from "./exchanges"; import { WALLET_EXCHANGE_PROTOCOL_VERSION } from "./versions"; import * as LibtoolVersion from "../util/libtoolVersion"; -import { guardOperationException, makeErrorDetails, OperationFailedError } from "./errors"; +import { + guardOperationException, + makeErrorDetails, + OperationFailedError, +} from "./errors"; import { NotificationType } from "../types/notifications"; import { getTimestampNow, diff --git a/packages/taler-wallet-core/src/types/dbTypes.ts b/packages/taler-wallet-core/src/types/dbTypes.ts index 28842398b..148ec8c35 100644 --- a/packages/taler-wallet-core/src/types/dbTypes.ts +++ b/packages/taler-wallet-core/src/types/dbTypes.ts @@ -1274,7 +1274,7 @@ export interface WalletContractData { /** * Fulfillment URL, or the empty string if the order has no fulfillment URL. - * + * * Stored as a non-nullable string as we use this field for IndexedDB indexing. */ fulfillmentUrl: string; diff --git a/packages/taler-wallet-core/src/types/talerTypes.ts b/packages/taler-wallet-core/src/types/talerTypes.ts index 14e1b5751..b9e7fae4a 100644 --- a/packages/taler-wallet-core/src/types/talerTypes.ts +++ b/packages/taler-wallet-core/src/types/talerTypes.ts @@ -963,7 +963,9 @@ export interface WithdrawUriInfoResponse { possibleExchanges: ExchangeListItem[]; } -export const codecForWithdrawUriInfoResponse = (): Codec => +export const codecForWithdrawUriInfoResponse = (): Codec< + WithdrawUriInfoResponse +> => buildCodecForObject() .property("amount", codecForAmountString()) .property("defaultExchangeBaseUrl", codecOptional(codecForString())) @@ -1046,14 +1048,18 @@ export const codecForTax = (): Codec => .property("tax", codecForString()) .build("Tax"); -export const codecForInternationalizedString = (): Codec => - codecForMap(codecForString()); +export const codecForInternationalizedString = (): Codec< + InternationalizedString +> => codecForMap(codecForString()); export const codecForProduct = (): Codec => buildCodecForObject() .property("product_id", codecOptional(codecForString())) .property("description", codecForString()) - .property("description_i18n", codecOptional(codecForInternationalizedString())) + .property( + "description_i18n", + codecOptional(codecForInternationalizedString()), + ) .property("quantity", codecOptional(codecForNumber())) .property("unit", codecOptional(codecForString())) .property("price", codecOptional(codecForString())) @@ -1066,7 +1072,10 @@ export const codecForContractTerms = (): Codec => .property("order_id", codecForString()) .property("fulfillment_url", codecOptional(codecForString())) .property("fulfillment_message", codecOptional(codecForString())) - .property("fulfillment_message_i18n", codecOptional(codecForInternationalizedString())) + .property( + "fulfillment_message_i18n", + codecOptional(codecForInternationalizedString()), + ) .property("merchant_base_url", codecForString()) .property("h_wire", codecForString()) .property("auto_refund", codecOptional(codecForDuration)) @@ -1086,10 +1095,7 @@ export const codecForContractTerms = (): Codec => .property("merchant", codecForMerchantInfo()) .property("merchant_pub", codecForString()) .property("exchanges", codecForList(codecForExchangeHandle())) - .property( - "products", - codecOptional(codecForList(codecForProduct())), - ) + .property("products", codecOptional(codecForList(codecForProduct()))) .property("extra", codecForAny()) .build("ContractTerms"); @@ -1296,13 +1302,13 @@ export const codecForMerchantOrderStatusPaid = (): Codec< .build("MerchantOrderStatusPaid"); export const codecForMerchantOrderRefundPickupResponse = (): Codec< - MerchantOrderRefundResponse - > => - buildCodecForObject() - .property("merchant_pub", codecForString()) - .property("refund_amount", codecForString()) - .property("refunds", codecForList(codecForMerchantCoinRefundStatus())) - .build("MerchantOrderRefundPickupResponse"); + MerchantOrderRefundResponse +> => + buildCodecForObject() + .property("merchant_pub", codecForString()) + .property("refund_amount", codecForString()) + .property("refunds", codecForList(codecForMerchantCoinRefundStatus())) + .build("MerchantOrderRefundPickupResponse"); export const codecForMerchantOrderStatusUnpaid = (): Codec< MerchantOrderStatusUnpaid diff --git a/packages/taler-wallet-core/src/types/walletTypes.ts b/packages/taler-wallet-core/src/types/walletTypes.ts index 3182d50bb..89c8b4a8b 100644 --- a/packages/taler-wallet-core/src/types/walletTypes.ts +++ b/packages/taler-wallet-core/src/types/walletTypes.ts @@ -50,7 +50,11 @@ import { codecForAny, buildCodecForUnion, } from "../util/codec"; -import { AmountString, codecForContractTerms, ContractTerms } from "./talerTypes"; +import { + AmountString, + codecForContractTerms, + ContractTerms, +} from "./talerTypes"; /** * Response for the create reserve request to the wallet. @@ -831,7 +835,9 @@ export const withdrawTestBalanceDefaults = { exchangeBaseUrl: "https://exchange.test.taler.net/", }; -export const codecForWithdrawTestBalance = (): Codec => +export const codecForWithdrawTestBalance = (): Codec< + WithdrawTestBalanceRequest +> => buildCodecForObject() .property("amount", codecForString()) .property("bankBaseUrl", codecForString()) diff --git a/packages/taler-wallet-core/src/util/RequestThrottler.ts b/packages/taler-wallet-core/src/util/RequestThrottler.ts index b56f7476a..f01e4395c 100644 --- a/packages/taler-wallet-core/src/util/RequestThrottler.ts +++ b/packages/taler-wallet-core/src/util/RequestThrottler.ts @@ -146,6 +146,6 @@ export class RequestThrottler { maxTokensHour: MAX_PER_HOUR, maxTokensMinute: MAX_PER_MINUTE, maxTokensSecond: MAX_PER_SECOND, - } + }; } } diff --git a/packages/taler-wallet-core/src/util/http.ts b/packages/taler-wallet-core/src/util/http.ts index 44c01a4e5..58b04d455 100644 --- a/packages/taler-wallet-core/src/util/http.ts +++ b/packages/taler-wallet-core/src/util/http.ts @@ -44,7 +44,7 @@ export interface HttpResponse { export interface HttpRequestOptions { headers?: { [name: string]: string }; - timeout?: Duration, + timeout?: Duration; } export enum HttpResponseStatus { diff --git a/packages/taler-wallet-core/src/util/query.ts b/packages/taler-wallet-core/src/util/query.ts index 6571491a1..6ebc3bbc4 100644 --- a/packages/taler-wallet-core/src/util/query.ts +++ b/packages/taler-wallet-core/src/util/query.ts @@ -37,7 +37,6 @@ import { } from "idb-bridge"; import { Logger } from "./logging"; - const logger = new Logger("query.ts"); /** diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts index 845c6d71d..ccc4e9d2c 100644 --- a/packages/taler-wallet-core/src/wallet.ts +++ b/packages/taler-wallet-core/src/wallet.ts @@ -351,7 +351,6 @@ export class Wallet { await p; } - /** * Process pending operations and wait for scheduled operations in * a loop until the wallet is stopped explicitly. -- cgit v1.2.3