From 16e7814445d57c2494ddaf3aaf11d60abb2b036b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 16 Sep 2022 17:21:54 +0200 Subject: -move declaration --- packages/taler-wallet-core/src/operations/backup/index.ts | 7 +------ packages/taler-wallet-core/src/operations/deposits.ts | 2 +- packages/taler-wallet-core/src/operations/pay.ts | 4 +--- packages/taler-wallet-core/src/operations/recoup.ts | 4 +--- packages/taler-wallet-core/src/operations/refresh.ts | 4 +--- packages/taler-wallet-core/src/operations/refund.ts | 3 +-- packages/taler-wallet-core/src/operations/tip.ts | 3 +-- packages/taler-wallet-core/src/operations/withdraw.ts | 3 +-- 8 files changed, 8 insertions(+), 22 deletions(-) (limited to 'packages/taler-wallet-core/src/operations') diff --git a/packages/taler-wallet-core/src/operations/backup/index.ts b/packages/taler-wallet-core/src/operations/backup/index.ts index db003af81..d4dfe2916 100644 --- a/packages/taler-wallet-core/src/operations/backup/index.ts +++ b/packages/taler-wallet-core/src/operations/backup/index.ts @@ -74,10 +74,7 @@ import { BackupProviderStateTag, BackupProviderTerms, ConfigRecord, - OperationAttemptResult, - OperationAttemptResultType, WalletBackupConfState, - WalletStoresV1, WALLET_BACKUP_STATE_KEY, } from "../../db.js"; import { InternalWalletState } from "../../internal-wallet-state.js"; @@ -89,9 +86,7 @@ import { checkDbInvariant, checkLogicInvariant, } from "../../util/invariants.js"; -import { GetReadWriteAccess } from "../../util/query.js"; -import { RetryInfo, RetryTags, scheduleRetryInTx } from "../../util/retries.js"; -import { guardOperationException } from "../common.js"; +import { OperationAttemptResult, OperationAttemptResultType, RetryTags, scheduleRetryInTx } from "../../util/retries.js"; import { checkPaymentByProposalId, confirmPay, diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index 22ec5f0a5..c16b2376d 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -47,11 +47,11 @@ import { import { DenominationRecord, DepositGroupRecord, - OperationAttemptResult, OperationStatus, } from "../db.js"; import { InternalWalletState } from "../internal-wallet-state.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; +import { OperationAttemptResult } from "../util/retries.js"; import { spendCoins } from "../wallet.js"; import { getExchangeDetails } from "./exchanges.js"; import { diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index 6b366f50d..468f9ca31 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -68,8 +68,6 @@ import { CoinRecord, CoinStatus, DenominationRecord, - OperationAttemptResult, - OperationAttemptResultType, ProposalRecord, ProposalStatus, PurchaseRecord, @@ -99,7 +97,7 @@ import { throwUnexpectedRequestError, } from "../util/http.js"; import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js"; -import { RetryInfo, RetryTags, scheduleRetry } from "../util/retries.js"; +import { OperationAttemptResult, OperationAttemptResultType, RetryInfo, RetryTags, scheduleRetry } from "../util/retries.js"; import { spendCoins } from "../wallet.js"; import { getExchangeDetails } from "./exchanges.js"; import { getTotalRefreshCost } from "./refresh.js"; diff --git a/packages/taler-wallet-core/src/operations/recoup.ts b/packages/taler-wallet-core/src/operations/recoup.ts index bd598511a..4424b9b40 100644 --- a/packages/taler-wallet-core/src/operations/recoup.ts +++ b/packages/taler-wallet-core/src/operations/recoup.ts @@ -42,8 +42,6 @@ import { CoinRecord, CoinSourceType, CoinStatus, - OperationAttemptResult, - OperationAttemptResultType, RecoupGroupRecord, RefreshCoinSource, ReserveRecordStatus, @@ -54,7 +52,7 @@ import { import { InternalWalletState } from "../internal-wallet-state.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; import { GetReadWriteAccess } from "../util/query.js"; -import { RetryInfo, runOperationHandlerForResult } from "../util/retries.js"; +import { OperationAttemptResult, RetryInfo, runOperationHandlerForResult } from "../util/retries.js"; import { guardOperationException } from "./common.js"; import { createRefreshGroup, processRefreshGroup } from "./refresh.js"; import { internalCreateWithdrawalGroup } from "./withdraw.js"; diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts index e968ec020..048ab15b3 100644 --- a/packages/taler-wallet-core/src/operations/refresh.ts +++ b/packages/taler-wallet-core/src/operations/refresh.ts @@ -57,8 +57,6 @@ import { CoinSourceType, CoinStatus, DenominationRecord, - OperationAttemptResult, - OperationAttemptResultType, OperationStatus, RefreshCoinStatus, RefreshGroupRecord, @@ -76,7 +74,7 @@ import { } from "../util/http.js"; import { checkDbInvariant } from "../util/invariants.js"; import { GetReadWriteAccess } from "../util/query.js"; -import { RetryInfo, runOperationHandlerForResult } from "../util/retries.js"; +import { OperationAttemptResult, OperationAttemptResultType, RetryInfo, runOperationHandlerForResult } from "../util/retries.js"; import { makeCoinAvailable, Wallet } from "../wallet.js"; import { guardOperationException } from "./common.js"; import { updateExchangeFromUrl } from "./exchanges.js"; diff --git a/packages/taler-wallet-core/src/operations/refund.ts b/packages/taler-wallet-core/src/operations/refund.ts index bdcdac943..0d86b92ab 100644 --- a/packages/taler-wallet-core/src/operations/refund.ts +++ b/packages/taler-wallet-core/src/operations/refund.ts @@ -44,7 +44,6 @@ import { PrepareRefundResult, RefreshReason, TalerErrorCode, - TalerErrorDetail, TalerProtocolTimestamp, TransactionType, URL, @@ -53,7 +52,6 @@ import { AbortStatus, CoinStatus, DenominationRecord, - OperationAttemptResult, PurchaseRecord, RefundReason, RefundState, @@ -63,6 +61,7 @@ import { InternalWalletState } from "../internal-wallet-state.js"; import { readSuccessResponseJsonOrThrow } from "../util/http.js"; import { checkDbInvariant } from "../util/invariants.js"; import { GetReadWriteAccess } from "../util/query.js"; +import { OperationAttemptResult } from "../util/retries.js"; import { createRefreshGroup, getTotalRefreshCost } from "./refresh.js"; import { makeEventId } from "./transactions.js"; diff --git a/packages/taler-wallet-core/src/operations/tip.ts b/packages/taler-wallet-core/src/operations/tip.ts index 9f96b7a7d..f79851be8 100644 --- a/packages/taler-wallet-core/src/operations/tip.ts +++ b/packages/taler-wallet-core/src/operations/tip.ts @@ -43,8 +43,6 @@ import { CoinSourceType, CoinStatus, DenominationRecord, - OperationAttemptResult, - OperationAttemptResultType, TipRecord, } from "../db.js"; import { makeErrorDetail } from "../errors.js"; @@ -54,6 +52,7 @@ import { readSuccessResponseJsonOrThrow, } from "../util/http.js"; import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js"; +import { OperationAttemptResult, OperationAttemptResultType } from "../util/retries.js"; import { makeCoinAvailable } from "../wallet.js"; import { updateExchangeFromUrl } from "./exchanges.js"; import { makeEventId } from "./transactions.js"; diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index cb0b55faf..6b31842b3 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -69,8 +69,6 @@ import { DenomSelectionState, ExchangeDetailsRecord, ExchangeRecord, - OperationAttemptResult, - OperationAttemptResultType, OperationStatus, PlanchetRecord, ReserveRecordStatus, @@ -95,6 +93,7 @@ import { } from "../util/http.js"; import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js"; import { DbAccess, GetReadOnlyAccess } from "../util/query.js"; +import { OperationAttemptResult, OperationAttemptResultType } from "../util/retries.js"; import { WALLET_BANK_INTEGRATION_PROTOCOL_VERSION, WALLET_EXCHANGE_PROTOCOL_VERSION, -- cgit v1.2.3