1 files changed, 8 insertions, 17 deletions
diff --git a/packages/taler-wallet-core/src/operations/common.ts b/packages/taler-wallet-core/src/operations/common.ts
index 92950b35b..6bafa632e 100644
--- a/packages/taler-wallet-core/src/operations/common.ts
+++ b/packages/taler-wallet-core/src/operations/common.ts
@@ -53,7 +53,7 @@ import {
   RecoupGroupRecord,
   RefreshGroupRecord,
   RewardRecord,
-  WalletStoresV1,
+  WalletDbReadWriteTransaction,
   WithdrawalGroupRecord,
   timestampPreciseToDb,
 } from "../db.js";
@@ -61,7 +61,6 @@ import { InternalWalletState } from "../internal-wallet-state.js";
 import { PendingTaskType, TaskId } from "../pending-types.js";
 import { assertUnreachable } from "../util/assertUnreachable.js";
 import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js";
-import { GetReadWriteAccess } from "../util/query.js";
 import { createRefreshGroup } from "./refresh.js";
 
 const logger = new Logger("operations/common.ts");
@@ -78,10 +77,7 @@ export interface CoinsSpendInfo {
 
 export async function makeCoinsVisible(
   ws: InternalWalletState,
-  tx: GetReadWriteAccess<{
-    coins: typeof WalletStoresV1.coins;
-    coinAvailability: typeof WalletStoresV1.coinAvailability;
-  }>,
+  tx: WalletDbReadWriteTransaction<["coins", "coinAvailability"]>,
   transactionId: string,
 ): Promise<void> {
   const coins =
@@ -109,11 +105,9 @@ export async function makeCoinsVisible(
 
 export async function makeCoinAvailable(
   ws: InternalWalletState,
-  tx: GetReadWriteAccess<{
-    coins: typeof WalletStoresV1.coins;
-    coinAvailability: typeof WalletStoresV1.coinAvailability;
-    denominations: typeof WalletStoresV1.denominations;
-  }>,
+  tx: WalletDbReadWriteTransaction<
+    ["coins", "coinAvailability", "denominations"]
+  >,
   coinRecord: CoinRecord,
 ): Promise<void> {
   checkLogicInvariant(coinRecord.status === CoinStatus.Fresh);
@@ -150,12 +144,9 @@ export async function makeCoinAvailable(
 
 export async function spendCoins(
   ws: InternalWalletState,
-  tx: GetReadWriteAccess<{
-    coins: typeof WalletStoresV1.coins;
-    coinAvailability: typeof WalletStoresV1.coinAvailability;
-    refreshGroups: typeof WalletStoresV1.refreshGroups;
-    denominations: typeof WalletStoresV1.denominations;
-  }>,
+  tx: WalletDbReadWriteTransaction<
+    ["coins", "coinAvailability", "refreshGroups", "denominations"]
+  >,
   csi: CoinsSpendInfo,
 ): Promise<void> {
   if (csi.coinPubs.length != csi.contributions.length) {