diff options
author | Florian Dold <florian@dold.me> | 2021-03-17 17:56:37 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-03-17 17:56:37 +0100 |
commit | 07cdfb2e4ec761021477271776b81f33af0e731d (patch) | |
tree | cb62b1d1a04e1e64b8ee47e78196e858727d2c0a /packages/taler-wallet-core/src/crypto/workers | |
parent | 42a4d666f42ce94274995bfdae644444ff5f6d53 (diff) | |
download | wallet-core-07cdfb2e4ec761021477271776b81f33af0e731d.tar.xz |
towards wallet-core / util split
Diffstat (limited to 'packages/taler-wallet-core/src/crypto/workers')
-rw-r--r-- | packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts | 8 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts index d7eddd699..c124b89d4 100644 --- a/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts +++ b/packages/taler-wallet-core/src/crypto/workers/cryptoApi.ts @@ -22,11 +22,11 @@ /** * Imports. */ -import { CoinRecord, DenominationRecord, WireFee } from "../../types/dbTypes"; +import { CoinRecord, DenominationRecord, WireFee } from "../../db"; import { CryptoWorker } from "./cryptoWorker"; -import { RecoupRequest, CoinDepositPermission } from "../../types/talerTypes"; +import { RecoupRequest, CoinDepositPermission } from "@gnu-taler/taler-util"; import { BenchmarkResult, @@ -34,7 +34,7 @@ import { PlanchetCreationRequest, DepositInfo, MakeSyncSignatureRequest, -} from "../../types/walletTypes"; +} from "@gnu-taler/taler-util"; import * as timer from "../../util/timer"; import { Logger } from "../../util/logging"; @@ -44,7 +44,7 @@ import { DeriveRefreshSessionRequest, DeriveTipRequest, SignTrackTransactionRequest, -} from "../../types/cryptoTypes"; +} from "../cryptoTypes.js"; const logger = new Logger("cryptoApi.ts"); diff --git a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts index 87fad8634..6e9427e57 100644 --- a/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts +++ b/packages/taler-wallet-core/src/crypto/workers/cryptoImplementation.ts @@ -26,23 +26,25 @@ * Imports. */ +// FIXME: Crypto should not use DB Types! import { CoinRecord, DenominationRecord, RefreshPlanchet, WireFee, CoinSourceType, -} from "../../types/dbTypes"; +} from "../../db.js"; -import { CoinDepositPermission, RecoupRequest } from "../../types/talerTypes"; +import { CoinDepositPermission, RecoupRequest } from "@gnu-taler/taler-util"; +// FIXME: These types should be internal to the wallet! import { BenchmarkResult, PlanchetCreationResult, PlanchetCreationRequest, DepositInfo, MakeSyncSignatureRequest, -} from "../../types/walletTypes"; -import { AmountJson, Amounts } from "../../util/amounts"; +} from "@gnu-taler/taler-util"; +import { AmountJson, Amounts } from "@gnu-taler/taler-util"; import * as timer from "../../util/timer"; import { encodeCrock, @@ -64,7 +66,7 @@ import { } from "../talerCrypto"; import { randomBytes } from "../primitives/nacl-fast"; import { kdf } from "../primitives/kdf"; -import { Timestamp, timestampTruncateToSecond } from "../../util/time"; +import { Timestamp, timestampTruncateToSecond } from "@gnu-taler/taler-util"; import { Logger } from "../../util/logging"; import { @@ -73,7 +75,7 @@ import { DeriveRefreshSessionRequest, DeriveTipRequest, SignTrackTransactionRequest, -} from "../../types/cryptoTypes"; +} from "../cryptoTypes.js"; const logger = new Logger("cryptoImplementation.ts"); |