From 5e6cc41b7a8b41aec30a81b787e5e4b5ed60661a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Jun 2021 13:56:29 +0200 Subject: fix issues with circular imports Parts of this commit are from a patch by sebasjm. The circular imports caused an issue with webpack. While we don't use webpack in the wallet, the wallet should still be importable by webpack. Some packages were importing their dependencies via "index.js", which re-exports public exports of the package. This resulted in circular dependencies which were resolved correctly by rollup, but not by webpack. --- packages/taler-wallet-core/src/operations/reserves.ts | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'packages/taler-wallet-core/src/operations/reserves.ts') diff --git a/packages/taler-wallet-core/src/operations/reserves.ts b/packages/taler-wallet-core/src/operations/reserves.ts index d06ce31ed..885865af7 100644 --- a/packages/taler-wallet-core/src/operations/reserves.ts +++ b/packages/taler-wallet-core/src/operations/reserves.ts @@ -40,16 +40,6 @@ import { ReserveRecord, WithdrawalGroupRecord, } from "../db.js"; -import { - Logger, - encodeCrock, - getRandomBytes, - readSuccessResponseJsonOrThrow, - URL, - readSuccessResponseJsonOrErrorCode, - throwUnexpectedRequestError, - TransactionHandle, -} from "../index.js"; import { assertUnreachable } from "../util/assertUnreachable.js"; import { canonicalizeBaseUrl } from "@gnu-taler/taler-util"; import { @@ -73,6 +63,11 @@ import { getBankWithdrawalInfo, } from "./withdraw.js"; import { getExchangeTrust } from "./currencies.js"; +import { encodeCrock, getRandomBytes } from "../crypto/talerCrypto.js"; +import { Logger } from "../util/logging.js"; +import { readSuccessResponseJsonOrErrorCode, readSuccessResponseJsonOrThrow, throwUnexpectedRequestError } from "../util/http.js"; +import { URL } from "../util/url.js"; +import { TransactionHandle } from "../util/query.js"; const logger = new Logger("reserves.ts"); -- cgit v1.2.3