diff options
Diffstat (limited to 'packages/taler-wallet-core/src/operations')
11 files changed, 11 insertions, 13 deletions
diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts index 8a0aad560..041c927a5 100644 --- a/packages/taler-wallet-core/src/operations/backup/index.ts +++ b/packages/taler-wallet-core/src/operations/backup/index.ts @@ -59,8 +59,8 @@ import { getTimestampNow, Timestamp, timestampAddDuration, + URL } from "@gnu-taler/taler-util"; -import { URL } from "../../util/url.js"; import { buildCodecForObject, Codec, diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index 5051fd32a..9dee7557c 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -36,6 +36,7 @@ import { timestampTruncateToSecond, TrackDepositGroupRequest, TrackDepositGroupResponse, + URL } from "@gnu-taler/taler-util"; import { InternalWalletState } from "../common.js"; import { kdf } from "../crypto/primitives/kdf.js"; @@ -49,7 +50,6 @@ import { guardOperationException } from "../errors.js"; import { selectPayCoins } from "../util/coinSelection.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; -import { URL } from "../util/url.js"; import { getExchangeDetails } from "./exchanges.js"; import { applyCoinSpend, diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index 65cc8f5e9..85455cf9c 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -37,6 +37,7 @@ import { parsePaytoUri, Recoup, TalerErrorCode, + URL, TalerErrorDetails, Timestamp, } from "@gnu-taler/taler-util"; @@ -59,7 +60,6 @@ import { } from "../util/http.js"; import { DbAccess, GetReadOnlyAccess } from "../util/query.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; -import { URL } from "../util/url.js"; import { guardOperationException, makeErrorDetails, diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index 2a9bf154e..464c3136f 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -51,6 +51,7 @@ import { PreparePayResultType, parsePayUri, Logger, + URL, getDurationRemaining, } from "@gnu-taler/taler-util"; import { encodeCrock, getRandomBytes } from "../crypto/talerCrypto.js"; @@ -99,7 +100,6 @@ import { OperationFailedAndReportedError, OperationFailedError, } from "../errors.js"; -import { URL } from "../util/url.js"; /** * Logger. diff --git a/packages/taler-wallet-core/src/operations/recoup.ts b/packages/taler-wallet-core/src/operations/recoup.ts index 402111129..4510bda10 100644 --- a/packages/taler-wallet-core/src/operations/recoup.ts +++ b/packages/taler-wallet-core/src/operations/recoup.ts @@ -45,9 +45,8 @@ import { } from "../db.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; -import { Logger } from "@gnu-taler/taler-util"; +import { Logger, URL } from "@gnu-taler/taler-util"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; -import { URL } from "../util/url.js"; import { guardOperationException } from "../errors.js"; import { createRefreshGroup, processRefreshGroup } from "./refresh.js"; import { getReserveRequestTimeout, processReserve } from "./reserves.js"; diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts index 06d735645..cf8b4ddde 100644 --- a/packages/taler-wallet-core/src/operations/refresh.ts +++ b/packages/taler-wallet-core/src/operations/refresh.ts @@ -50,8 +50,8 @@ import { timestampAddDuration, timestampDifference, timestampMin, + URL, } from "@gnu-taler/taler-util"; -import { URL } from "../util/url.js"; import { guardOperationException } from "../errors.js"; import { updateExchangeFromUrl } from "./exchanges.js"; import { EXCHANGE_COINS_LOCK, InternalWalletState } from "../common.js"; diff --git a/packages/taler-wallet-core/src/operations/refund.ts b/packages/taler-wallet-core/src/operations/refund.ts index 09006b811..4ea80689c 100644 --- a/packages/taler-wallet-core/src/operations/refund.ts +++ b/packages/taler-wallet-core/src/operations/refund.ts @@ -42,6 +42,7 @@ import { RefreshReason, TalerErrorCode, TalerErrorDetails, + URL, timestampAddDuration, } from "@gnu-taler/taler-util"; import { @@ -56,7 +57,6 @@ import { readSuccessResponseJsonOrThrow } from "../util/http.js"; import { checkDbInvariant } from "../util/invariants.js"; import { GetReadWriteAccess } from "../util/query.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; -import { URL } from "../util/url.js"; import { guardOperationException } from "../errors.js"; import { createRefreshGroup, getTotalRefreshCost } from "./refresh.js"; import { InternalWalletState } from "../common.js"; diff --git a/packages/taler-wallet-core/src/operations/reserves.ts b/packages/taler-wallet-core/src/operations/reserves.ts index fca4d2143..162b5b405 100644 --- a/packages/taler-wallet-core/src/operations/reserves.ts +++ b/packages/taler-wallet-core/src/operations/reserves.ts @@ -64,13 +64,12 @@ import { getBankWithdrawalInfo, } from "./withdraw.js"; import { encodeCrock, getRandomBytes } from "../crypto/talerCrypto.js"; -import { Logger } from "@gnu-taler/taler-util"; +import { Logger, URL } from "@gnu-taler/taler-util"; import { readSuccessResponseJsonOrErrorCode, readSuccessResponseJsonOrThrow, throwUnexpectedRequestError, } from "../util/http.js"; -import { URL } from "../util/url.js"; import { GetReadOnlyAccess } from "../util/query.js"; const logger = new Logger("reserves.ts"); diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index 8a0c20200..c9786801b 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -31,11 +31,11 @@ import { IntegrationTestArgs, Amounts, TestPayArgs, + URL, PreparePayResultType, } from "@gnu-taler/taler-util"; import { createTalerWithdrawReserve } from "./reserves.js"; import { InternalWalletState } from "../common.js"; -import { URL } from "../util/url.js"; import { confirmPay, preparePayForUri } from "./pay.js"; import { getBalances } from "./balance.js"; import { runUntilDone } from "../wallet.js"; diff --git a/packages/taler-wallet-core/src/operations/tip.ts b/packages/taler-wallet-core/src/operations/tip.ts index 1da2c887a..892a3b588 100644 --- a/packages/taler-wallet-core/src/operations/tip.ts +++ b/packages/taler-wallet-core/src/operations/tip.ts @@ -29,6 +29,7 @@ import { TalerErrorCode, codecForTipResponse, Logger, + URL, } from "@gnu-taler/taler-util"; import { DerivedTipPlanchet } from "../crypto/cryptoTypes.js"; import { @@ -50,7 +51,6 @@ import { selectWithdrawalDenominations, denomSelectionInfoToState, } from "./withdraw.js"; -import { URL } from "../util/url.js"; import { getHttpResponseErrorDetails, readSuccessResponseJsonOrThrow, diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index 6cf20259c..e966f6a14 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -39,6 +39,7 @@ import { timestampCmp, timestampSubtractDuraction, WithdrawResponse, + URL, WithdrawUriInfoResponse, } from "@gnu-taler/taler-util"; import { @@ -56,7 +57,6 @@ import { import { walletCoreDebugFlags } from "../util/debugFlags.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; -import { URL } from "../util/url.js"; import { guardOperationException, makeErrorDetails, |