wallet-core: better import hygiene, cleanup withdrawals

3 files changed, 8 insertions, 15 deletions

diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts
index f33891c88..88dd08f63 100644
--- a/packages/taler-wallet-core/src/util/coinSelection.ts
+++ b/packages/taler-wallet-core/src/util/coinSelection.ts
@@ -54,18 +54,15 @@ import {
   TalerProtocolTimestamp,
   UnblindedSignature,
 } from "@gnu-taler/taler-util";
-import { DenominationRecord } from "../db.js";
-import {
-  getExchangeWireDetailsInTx,
-  isWithdrawableDenom,
-  WalletDbReadOnlyTransaction,
-} from "../index.js";
-import { InternalWalletState } from "../internal-wallet-state.js";
 import {
   getMerchantPaymentBalanceDetails,
   getPeerPaymentBalanceDetailsInTx,
 } from "../balance.js";
 import { getAutoRefreshExecuteThreshold } from "../common.js";
+import { DenominationRecord, WalletDbReadOnlyTransaction } from "../db.js";
+import { getExchangeWireDetailsInTx } from "../exchanges.js";
+import { InternalWalletState } from "../internal-wallet-state.js";
+import { isWithdrawableDenom } from "./denominations.js";
 import { checkDbInvariant, checkLogicInvariant } from "./invariants.js";
 
 const logger = new Logger("coinSelection.ts");
diff --git a/packages/taler-wallet-core/src/util/denominations.ts b/packages/taler-wallet-core/src/util/denominations.ts
index db6e69956..9557c078a 100644
--- a/packages/taler-wallet-core/src/util/denominations.ts
+++ b/packages/taler-wallet-core/src/util/denominations.ts
@@ -27,8 +27,7 @@ import {
   TalerProtocolTimestamp,
   TimePoint,
 } from "@gnu-taler/taler-util";
-import { DenominationRecord } from "../db.js";
-import { timestampProtocolFromDb } from "../index.js";
+import { DenominationRecord, timestampProtocolFromDb } from "../db.js";
 
 /**
  * Given a list of denominations with the same value and same period of time:
diff --git a/packages/taler-wallet-core/src/util/instructedAmountConversion.ts b/packages/taler-wallet-core/src/util/instructedAmountConversion.ts
index c4a2f2d5c..f01dc4e21 100644
--- a/packages/taler-wallet-core/src/util/instructedAmountConversion.ts
+++ b/packages/taler-wallet-core/src/util/instructedAmountConversion.ts
@@ -30,12 +30,9 @@ import {
   parsePaytoUri,
   strcmp,
 } from "@gnu-taler/taler-util";
-import {
-  DenominationRecord,
-  InternalWalletState,
-  getExchangeWireDetailsInTx,
-  timestampProtocolFromDb,
-} from "../index.js";
+import { DenominationRecord, timestampProtocolFromDb } from "../db.js";
+import { getExchangeWireDetailsInTx } from "../exchanges.js";
+import { InternalWalletState } from "../internal-wallet-state.js";
 import { CoinInfo } from "./coinSelection.js";
 import { checkDbInvariant } from "./invariants.js";