cleanups

src/yoroi-wallets/cardano/CardanoWallet.ts

@@ -31,7 +31,7 @@ import {
 } from '../../legacy/networks'
 import {IsLockedError, nonblockingSynchronize, synchronize} from '../../legacy/promise'
 import type {WalletMeta} from '../../legacy/state'
-import {makeMemosManager, MemosManager} from '../memosManager'
+import {makeMemosManager, MemosManager} from '../memos'
 import {YoroiStorage} from '../storage'
 import type {
   AccountStateResponse,

src/yoroi-wallets/index.ts

@@ -1,4 +1,5 @@
 export * from './cardano'
 export * from './encryption/encryption'
 export * from './hwWallet'
+export * from './utils'
 export * from './walletManager'

src/yoroi-wallets/memos/index.ts

@@ -0,0 +1 @@
+export * from './memosManager'

src/yoroi-wallets/memosManager.test.ts → src/yoroi-wallets/memos/memosManager.test.ts

@@ -1,7 +1,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 
+import {storage as rootStorage} from '../storage'
 import {makeMemosManager} from './memosManager'
-import {storage as rootStorage} from './storage'
 
 describe('memos manager', () => {
   beforeEach(() => AsyncStorage.clear())

src/yoroi-wallets/memosManager.ts → src/yoroi-wallets/memos/memosManager.ts

@@ -1,11 +1,11 @@
-import {YoroiStorage} from './storage'
-import * as parsing from './utils/parsing'
+import {YoroiStorage} from '../storage'
+import {isString, parseString} from '../utils/parsing'
 
 export const makeMemosManager = async (storage: YoroiStorage) => {
   const getMemos = () =>
     storage
       .getAllKeys()
-      .then((keys) => storage.multiGet(keys, parsing.parseString))
+      .then((keys) => storage.multiGet(keys, parseString))
       .then(filterCorruptEntries)
       .then((tuples) => Object.fromEntries(tuples))
 
@@ -34,7 +34,7 @@ export const makeMemosManager = async (storage: YoroiStorage) => {
 }
 
 const filterCorruptEntries = (tuples: [string, string | undefined][]) => {
-  return tuples.filter((tuple): tuple is [string, string] => parsing.isString(tuple[1]))
+  return tuples.filter((tuple): tuple is [string, string] => isString(tuple[1]))
 }
 
 export type MemosManager = Awaited<ReturnType<typeof makeMemosManager>>

src/yoroi-wallets/utils/index.ts

@@ -0,0 +1,6 @@
+export * from './amountUtils'
+export * from './parsing'
+export * from './timeUtils'
+export * from './utils'
+export * from './validators'
+export * from './versioning'

src/yoroi-wallets/utils.test.ts → src/yoroi-wallets/utils/utils.test.ts

@@ -1,6 +1,6 @@
-import {Quantity, YoroiAmount, YoroiAmounts, YoroiEntries, YoroiEntry} from './types'
-import {RawUtxo} from './types/other'
-import {Amounts, Entries, Quantities, Utxos} from './utils'
+import {Quantity, YoroiAmount, YoroiAmounts, YoroiEntries, YoroiEntry} from '../types'
+import {RawUtxo} from '../types/other'
+import {Amounts, Entries, Quantities, Utxos} from '.'
 
 describe('Quantities', () => {
   it('sum', () => {

src/yoroi-wallets/utils.ts → src/yoroi-wallets/utils/utils.ts

@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 
-import {Quantity, TokenId, YoroiAmount, YoroiAmounts, YoroiEntries, YoroiEntry} from './types'
-import {RawUtxo} from './types/other'
+import {Quantity, RawUtxo, TokenId, YoroiAmount, YoroiAmounts, YoroiEntries, YoroiEntry} from '../types'
 
 export const Entries = {
   first: (entries: YoroiEntries): YoroiEntry => {

src/yoroi-wallets/walletManager/index.ts

@@ -0,0 +1 @@
+export * from './walletManager'

src/yoroi-wallets/walletManager.test.ts → src/yoroi-wallets/walletManager/walletManager.test.ts

@@ -1,9 +1,9 @@
 /* eslint-disable no-unused-labels */
 import AsyncStorage from '@react-native-async-storage/async-storage'
 
-import {isYoroiWallet} from './cardano'
-import {parseSafe} from './utils/parsing'
-import {WalletManager} from './walletManager'
+import {isYoroiWallet} from '../cardano'
+import {parseSafe} from '../utils/parsing'
+import {WalletManager} from '.'
 
 describe('walletMananger', () => {
   beforeEach(() => AsyncStorage.clear())

src/yoroi-wallets/walletManager.ts → src/yoroi-wallets/walletManager/walletManager.ts

@@ -2,16 +2,16 @@
 import ExtendableError from 'es6-error'
 import uuid from 'uuid'
 
-import {makeWalletEncryptedStorage} from '../auth'
-import {Keychain} from '../auth/Keychain'
-import type {HWDeviceInfo} from '../legacy/ledgerUtils'
-import {Logger} from '../legacy/logging'
-import type {WalletMeta} from '../legacy/state'
-import {isWalletMeta, migrateWalletMetas, parseWalletMeta} from '../Storage/migrations/walletMeta'
-import {CardanoWallet, isYoroiWallet, NetworkId, WalletImplementationId, YoroiWallet} from './cardano'
-import {storage, YoroiStorage} from './storage'
-import {WALLET_IMPLEMENTATION_REGISTRY} from './types/other'
-import {parseSafe} from './utils/parsing'
+import {makeWalletEncryptedStorage} from '../../auth'
+import {Keychain} from '../../auth/Keychain'
+import {HWDeviceInfo} from '../../legacy/ledgerUtils'
+import {Logger} from '../../legacy/logging'
+import {WalletMeta} from '../../legacy/state'
+import {isWalletMeta, migrateWalletMetas, parseWalletMeta} from '../../Storage/migrations/walletMeta'
+import {CardanoWallet, isYoroiWallet, NetworkId, WalletImplementationId, YoroiWallet} from '../cardano'
+import {storage, YoroiStorage} from '../storage'
+import {WALLET_IMPLEMENTATION_REGISTRY} from '../types'
+import {parseSafe} from '../utils'
 
 export class WalletClosed extends ExtendableError {}