From e888d7f292f68a58fc4b56771fb8a38219d53b86 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 19 Feb 2024 18:20:43 +0100
Subject: wallet-core: fix import paths, remove unused code, thread through
 cancellation tokens

---
 packages/taler-wallet-core/src/pay-merchant.ts | 30 ++++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'packages/taler-wallet-core/src/pay-merchant.ts')

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,21 +133,7 @@ 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,
@@ -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);
-- 
cgit v1.2.3