diff options
author | Florian Dold <florian@dold.me> | 2024-02-19 18:20:43 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2024-02-19 18:20:43 +0100 |
commit | e888d7f292f68a58fc4b56771fb8a38219d53b86 (patch) | |
tree | 54f2eab7c510cee5a2b90b6b2ccba94a437d8f91 /packages/taler-wallet-core/src/pay-merchant.ts | |
parent | e951075d2ef52fa8e9e7489c62031777c3a7e66b (diff) | |
download | wallet-core-e888d7f292f68a58fc4b56771fb8a38219d53b86.tar.xz |
wallet-core: fix import paths, remove unused code, thread through cancellation tokens
Diffstat (limited to 'packages/taler-wallet-core/src/pay-merchant.ts')
-rw-r--r-- | packages/taler-wallet-core/src/pay-merchant.ts | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts index f294035e6..0bd851464 100644 --- a/packages/taler-wallet-core/src/pay-merchant.ts +++ b/packages/taler-wallet-core/src/pay-merchant.ts @@ -32,6 +32,7 @@ import { Amounts, AmountString, AsyncFlag, + CancellationToken, codecForAbortResponse, codecForMerchantContractTerms, codecForMerchantOrderRefundPickupResponse, @@ -94,6 +95,17 @@ import { readUnexpectedResponseDetails, throwUnexpectedRequestError, } from "@gnu-taler/taler-util/http"; +import { + constructTaskIdentifier, + DbRetryInfo, + spendCoins, + TaskIdentifiers, + TaskRunResult, + TaskRunResultType, + TombstoneTag, + TransactionContext, + TransitionResult, +} from "./common.js"; import { EddsaKeypair } from "./crypto/cryptoImplementation.js"; import { CoinRecord, @@ -121,22 +133,8 @@ import { EXCHANGE_COINS_LOCK, InternalWalletState, } from "./internal-wallet-state.js"; -import { assertUnreachable } from "./util/assertUnreachable.js"; -import { PreviousPayCoins, selectPayCoinsNew } from "./util/coinSelection.js"; -import { checkDbInvariant } from "./util/invariants.js"; import { DbReadWriteTransaction, StoreNames } from "./query.js"; import { - constructTaskIdentifier, - DbRetryInfo, - spendCoins, - TaskIdentifiers, - TaskRunResult, - TaskRunResultType, - TombstoneTag, - TransactionContext, - TransitionResult, -} from "./common.js"; -import { calculateRefreshOutput, createRefreshGroup, getTotalRefreshCost, @@ -146,6 +144,9 @@ import { notifyTransition, parseTransactionIdentifier, } from "./transactions.js"; +import { assertUnreachable } from "./util/assertUnreachable.js"; +import { PreviousPayCoins, selectPayCoinsNew } from "./util/coinSelection.js"; +import { checkDbInvariant } from "./util/invariants.js"; /** * Logger. @@ -1935,6 +1936,7 @@ export async function confirmPay( export async function processPurchase( ws: InternalWalletState, proposalId: string, + cancellationToken: CancellationToken, ): Promise<TaskRunResult> { const purchase = await ws.db.runReadOnlyTx(["purchases"], async (tx) => { return tx.purchases.get(proposalId); |