From 5e96bb487fb5e700aa3078558a6cddd146cb7d6e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 2 Jun 2021 10:58:37 -0300 Subject: remove references to the index.ts in the import --- .../src/operations/backup/export.ts | 3 +- .../src/operations/backup/import.ts | 2 +- .../src/operations/backup/state.ts | 3 +- .../taler-wallet-core/src/operations/balance.ts | 2 +- .../taler-wallet-core/src/operations/exchanges.ts | 16 +++----- packages/taler-wallet-core/src/operations/pay.ts | 44 +++++++++------------- packages/taler-wallet-core/src/operations/state.ts | 5 ++- .../taler-wallet-core/src/operations/testing.ts | 2 +- packages/taler-wallet-core/src/operations/tip.ts | 12 ++---- 9 files changed, 38 insertions(+), 51 deletions(-) (limited to 'packages/taler-wallet-core') diff --git a/packages/taler-wallet-core/src/operations/backup/export.ts b/packages/taler-wallet-core/src/operations/backup/export.ts index fa0af1b07..4b574fe4e 100644 --- a/packages/taler-wallet-core/src/operations/backup/export.ts +++ b/packages/taler-wallet-core/src/operations/backup/export.ts @@ -64,9 +64,8 @@ import { AbortStatus, ProposalStatus, } from "../../db.js"; -import { encodeCrock, stringToBytes, getRandomBytes } from "../../index.js"; import { canonicalizeBaseUrl, canonicalJson } from "@gnu-taler/taler-util"; -import { getExchangeDetails } from "../exchanges.js"; +import { encodeCrock, getRandomBytes, stringToBytes } from "../../crypto/talerCrypto.js"; export async function exportBackup( ws: InternalWalletState, diff --git a/packages/taler-wallet-core/src/operations/backup/import.ts b/packages/taler-wallet-core/src/operations/backup/import.ts index f0a944a22..e8cb4a38f 100644 --- a/packages/taler-wallet-core/src/operations/backup/import.ts +++ b/packages/taler-wallet-core/src/operations/backup/import.ts @@ -47,7 +47,6 @@ import { RefreshSessionRecord, WireInfo, } from "../../db.js"; -import { TransactionHandle } from "../../index.js"; import { PayCoinSelection } from "../../util/coinSelection"; import { j2s } from "@gnu-taler/taler-util"; import { checkDbInvariant, checkLogicInvariant } from "../../util/invariants"; @@ -57,6 +56,7 @@ import { InternalWalletState } from "../state"; import { provideBackupState } from "./state"; import { makeEventId, TombstoneTag } from "../transactions.js"; import { getExchangeDetails } from "../exchanges.js"; +import { TransactionHandle } from "../../util/query.js"; const logger = new Logger("operations/backup/import.ts"); diff --git a/packages/taler-wallet-core/src/operations/backup/state.ts b/packages/taler-wallet-core/src/operations/backup/state.ts index e2a0f4cf3..d69eaaa60 100644 --- a/packages/taler-wallet-core/src/operations/backup/state.ts +++ b/packages/taler-wallet-core/src/operations/backup/state.ts @@ -15,9 +15,10 @@ */ import { Timestamp } from "@gnu-taler/taler-util"; +import { encodeCrock, getRandomBytes } from "../../crypto/talerCrypto.js"; import { ConfigRecord, Stores } from "../../db.js"; -import { getRandomBytes, encodeCrock, TransactionHandle } from "../../index.js"; import { checkDbInvariant } from "../../util/invariants"; +import { TransactionHandle } from "../../util/query.js"; import { InternalWalletState } from "../state"; export interface WalletBackupConfState { diff --git a/packages/taler-wallet-core/src/operations/balance.ts b/packages/taler-wallet-core/src/operations/balance.ts index 741c46ebf..20911face 100644 --- a/packages/taler-wallet-core/src/operations/balance.ts +++ b/packages/taler-wallet-core/src/operations/balance.ts @@ -19,7 +19,7 @@ */ import { AmountJson, BalancesResponse, Amounts } from "@gnu-taler/taler-util"; import { Stores, CoinStatus } from "../db.js"; -import { TransactionHandle } from "../index.js"; +import { TransactionHandle } from "../util/query.js"; import { Logger } from "../util/logging"; import { InternalWalletState } from "./state.js"; diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index be9a383d2..72e24807f 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -50,14 +50,8 @@ import { } from "../db.js"; import { Logger, - URL, - readSuccessResponseJsonOrThrow, - getExpiryTimestamp, - readSuccessResponseTextOrThrow, - encodeCrock, - hash, - decodeCrock, -} from "../index.js"; +} from "../util/logging"; + import { j2s, canonicalizeBaseUrl } from "@gnu-taler/taler-util"; import { updateRetryInfoTimeout, initRetryInfo } from "../util/retries.js"; import { @@ -71,9 +65,11 @@ import { WALLET_CACHE_BREAKER_CLIENT_VERSION, WALLET_EXCHANGE_PROTOCOL_VERSION, } from "./versions.js"; -import { HttpRequestLibrary } from "../util/http.js"; -import { CryptoApi } from "../crypto/workers/cryptoApi.js"; +import { URL } from "../util/url.js"; +import { getExpiryTimestamp, HttpRequestLibrary, readSuccessResponseJsonOrThrow, readSuccessResponseTextOrThrow } from "../util/http.js"; +import { decodeCrock, encodeCrock, hash } from "../crypto/talerCrypto.js"; import { TransactionHandle } from "../util/query.js"; +import { CryptoApi } from "../crypto/workers/cryptoApi.js"; const logger = new Logger("exchanges.ts"); diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index dad460b8c..bbd7c0d86 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -52,32 +52,6 @@ import { parsePayUri, } from "@gnu-taler/taler-util"; import { encodeCrock, getRandomBytes } from "../crypto/talerCrypto"; -import { - AbortStatus, - AllowedAuditorInfo, - AllowedExchangeInfo, - CoinRecord, - CoinStatus, - DenominationRecord, - getHttpResponseErrorDetails, - guardOperationException, - HttpResponseStatus, - Logger, - makeErrorDetails, - OperationFailedAndReportedError, - OperationFailedError, - ProposalRecord, - ProposalStatus, - PurchaseRecord, - readSuccessResponseJsonOrErrorCode, - readSuccessResponseJsonOrThrow, - readTalerErrorResponse, - Stores, - throwUnexpectedRequestError, - TransactionHandle, - URL, - WalletContractData, -} from "../index.js"; import { PayCoinSelection, CoinCandidateSelection, @@ -95,6 +69,24 @@ import { getTotalRefreshCost, createRefreshGroup } from "./refresh.js"; import { InternalWalletState, EXCHANGE_COINS_LOCK } from "./state.js"; import { ContractTermsUtil } from "../util/contractTerms.js"; import { getExchangeDetails } from "./exchanges.js"; +import { Logger } from "../util/logging.js"; +import { + AllowedAuditorInfo, + AllowedExchangeInfo, + CoinRecord, + CoinStatus, + DenominationRecord, + Stores, + AbortStatus, + ProposalRecord, + ProposalStatus, + PurchaseRecord, + WalletContractData, +} from "../db.js"; +import { TransactionHandle } from "../util/query.js"; +import { guardOperationException, makeErrorDetails, OperationFailedAndReportedError, OperationFailedError } from "./errors.js"; +import { URL } from "../util/url.js"; +import { getHttpResponseErrorDetails, HttpResponseStatus, readSuccessResponseJsonOrErrorCode, readSuccessResponseJsonOrThrow, readTalerErrorResponse, throwUnexpectedRequestError } from "../util/http.js"; /** * Logger. diff --git a/packages/taler-wallet-core/src/operations/state.ts b/packages/taler-wallet-core/src/operations/state.ts index 752a57ffb..39ba71b1e 100644 --- a/packages/taler-wallet-core/src/operations/state.ts +++ b/packages/taler-wallet-core/src/operations/state.ts @@ -18,11 +18,14 @@ * Imports. */ import { WalletNotification, BalancesResponse } from "@gnu-taler/taler-util"; +import { CryptoApi, CryptoWorkerFactory } from "../crypto/workers/cryptoApi.js"; import { Stores } from "../db.js"; -import { Logger, CryptoApi, OpenedPromise, Database, CryptoWorkerFactory, openPromise } from "../index.js"; import { PendingOperationsResponse } from "../pending-types.js"; import { AsyncOpMemoMap, AsyncOpMemoSingle } from "../util/asyncMemo.js"; import { HttpRequestLibrary } from "../util/http"; +import { Logger } from "../util/logging.js"; +import { OpenedPromise, openPromise } from "../util/promiseUtils.js"; +import { Database } from "../util/query.js"; type NotificationListener = (n: WalletNotification) => void; diff --git a/packages/taler-wallet-core/src/operations/testing.ts b/packages/taler-wallet-core/src/operations/testing.ts index aa9afc50d..e2785dd11 100644 --- a/packages/taler-wallet-core/src/operations/testing.ts +++ b/packages/taler-wallet-core/src/operations/testing.ts @@ -24,10 +24,10 @@ import { checkSuccessResponseOrThrow, } from "../util/http"; import { AmountString, codecForAny, CheckPaymentResponse, codecForCheckPaymentResponse, IntegrationTestArgs, Amounts, TestPayArgs, PreparePayResultType } from "@gnu-taler/taler-util"; -import { URL } from "../index.js"; import { Wallet } from "../wallet.js"; import { createTalerWithdrawReserve } from "./reserves.js"; import { InternalWalletState } from "./state.js"; +import { URL } from "../util/url.js"; const logger = new Logger("operations/testing.ts"); diff --git a/packages/taler-wallet-core/src/operations/tip.ts b/packages/taler-wallet-core/src/operations/tip.ts index 6de116098..78f8a7a31 100644 --- a/packages/taler-wallet-core/src/operations/tip.ts +++ b/packages/taler-wallet-core/src/operations/tip.ts @@ -37,14 +37,6 @@ import { CoinSourceType, CoinStatus, } from "../db.js"; -import { - Logger, - URL, - readSuccessResponseJsonOrThrow, - encodeCrock, - getRandomBytes, - getHttpResponseErrorDetails, -} from "../index.js"; import { j2s } from "@gnu-taler/taler-util"; import { checkDbInvariant, checkLogicInvariant } from "../util/invariants.js"; import { initRetryInfo, updateRetryInfoTimeout } from "../util/retries.js"; @@ -58,6 +50,10 @@ import { selectWithdrawalDenominations, denomSelectionInfoToState, } from "./withdraw.js"; +import { Logger } from "../util/logging.js"; +import { URL } from "../util/url.js"; +import { getHttpResponseErrorDetails, readSuccessResponseJsonOrThrow } from "../util/http.js"; +import { encodeCrock, getRandomBytes } from "../crypto/talerCrypto.js"; const logger = new Logger("operations/tip.ts"); -- cgit v1.2.3