From 5681b82a3c4dbbcd3615a0e451ac2f542d4a57a8 Mon Sep 17 00:00:00 2001 From: Tom Kirkpatrick Date: Fri, 29 Jun 2018 13:29:36 +0200 Subject: [PATCH] refactor: move helper code to lib directory --- .eslintignore | 4 +--- .flowconfig | 1 + app/components/Activity/InvoiceModal.js | 2 +- app/components/Activity/TransactionModal.js | 2 +- app/components/Contacts/ContactModal.js | 2 +- app/components/Contacts/Network.js | 2 +- app/components/Form/Pay.js | 2 +- app/components/Form/Request.js | 2 +- app/components/Onboarding/Syncing.js | 2 +- app/components/Value/Value.js | 2 +- app/components/Wallet/ReceiveModal.js | 2 +- app/components/Wallet/Wallet.js | 2 +- app/containers/Root.js | 12 ++++++------ app/{lnd/config/index.js => lib/lnd/config.js} | 0 app/{ => lib}/lnd/index.js | 2 +- app/{lnd/lib => lib/lnd}/lightning.js | 12 ++++++------ app/{ => lib}/lnd/methods/channelController.js | 0 app/{ => lib}/lnd/methods/index.js | 0 app/{ => lib}/lnd/methods/invoicesController.js | 0 app/{ => lib}/lnd/methods/networkController.js | 0 app/{ => lib}/lnd/methods/paymentsController.js | 0 app/{ => lib}/lnd/methods/peersController.js | 0 app/{ => lib}/lnd/methods/walletController.js | 0 app/{lnd/lib => lib/lnd}/neutrino.js | 4 ++-- app/{ => lib}/lnd/push/closechannel.js | 0 app/{ => lib}/lnd/push/openchannel.js | 0 app/{ => lib}/lnd/push/subscribeinvoice.js | 0 app/{ => lib}/lnd/subscribe/channelgraph.js | 0 app/{ => lib}/lnd/subscribe/invoices.js | 0 app/{ => lib}/lnd/subscribe/transactions.js | 0 app/{lnd/lib => lib/lnd}/util.js | 2 +- app/{lnd/lib => lib/lnd}/walletUnlocker.js | 2 +- app/{ => lib}/lnd/walletUnlockerMethods/index.js | 0 app/{api/index.js => lib/utils/api.js} | 0 app/{ => lib}/utils/bech32.js | 0 app/{ => lib}/utils/blockExplorer.js | 0 app/{ => lib}/utils/btc.js | 0 app/{ => lib}/utils/index.js | 0 app/{ => lib}/utils/log.js | 0 .../index.js => lib/utils/notifications.js} | 0 app/{ => lib}/utils/usd.js | 0 app/{zap.js => lib/zap/controller.js} | 10 +++++----- app/{menu.js => lib/zap/menuBuilder.js} | 2 +- app/{ => lib/zap}/updater.js | 2 +- app/main.dev.js | 10 +++++----- app/reducers/channels.js | 7 ++++--- app/reducers/contactsform.js | 3 +-- app/reducers/invoice.js | 5 +++-- app/reducers/lnd.js | 2 +- app/reducers/network.js | 2 +- app/reducers/payform.js | 3 +-- app/reducers/requestform.js | 2 +- app/reducers/ticker.js | 2 +- app/reducers/transaction.js | 4 ++-- .../components/components/Invoice/Invoice.js | 2 +- .../components/components/Payment/Payment.js | 2 +- .../components/components/Transaction/Transaction.js | 2 +- app/routes/app/containers/AppContainer.js | 2 +- app/utils/.gitkeep | 0 test/utils/usd.spec.js | 2 +- webpack.config.renderer.dev.js | 2 +- 61 files changed, 62 insertions(+), 63 deletions(-) rename app/{lnd/config/index.js => lib/lnd/config.js} (100%) rename app/{ => lib}/lnd/index.js (91%) rename app/{lnd/lib => lib/lnd}/lightning.js (91%) rename app/{ => lib}/lnd/methods/channelController.js (100%) rename app/{ => lib}/lnd/methods/index.js (100%) rename app/{ => lib}/lnd/methods/invoicesController.js (100%) rename app/{ => lib}/lnd/methods/networkController.js (100%) rename app/{ => lib}/lnd/methods/paymentsController.js (100%) rename app/{ => lib}/lnd/methods/peersController.js (100%) rename app/{ => lib}/lnd/methods/walletController.js (100%) rename app/{lnd/lib => lib/lnd}/neutrino.js (98%) rename app/{ => lib}/lnd/push/closechannel.js (100%) rename app/{ => lib}/lnd/push/openchannel.js (100%) rename app/{ => lib}/lnd/push/subscribeinvoice.js (100%) rename app/{ => lib}/lnd/subscribe/channelgraph.js (100%) rename app/{ => lib}/lnd/subscribe/invoices.js (100%) rename app/{ => lib}/lnd/subscribe/transactions.js (100%) rename app/{lnd/lib => lib/lnd}/util.js (99%) rename app/{lnd/lib => lib/lnd}/walletUnlocker.js (96%) rename app/{ => lib}/lnd/walletUnlockerMethods/index.js (100%) rename app/{api/index.js => lib/utils/api.js} (100%) rename app/{ => lib}/utils/bech32.js (100%) rename app/{ => lib}/utils/blockExplorer.js (100%) rename app/{ => lib}/utils/btc.js (100%) rename app/{ => lib}/utils/index.js (100%) rename app/{ => lib}/utils/log.js (100%) rename app/{notifications/index.js => lib/utils/notifications.js} (100%) rename app/{ => lib}/utils/usd.js (100%) rename app/{zap.js => lib/zap/controller.js} (98%) rename app/{menu.js => lib/zap/menuBuilder.js} (99%) rename app/{ => lib/zap}/updater.js (96%) delete mode 100644 app/utils/.gitkeep diff --git a/.eslintignore b/.eslintignore index d02a44f0..be2fd646 100644 --- a/.eslintignore +++ b/.eslintignore @@ -41,9 +41,7 @@ app/main.prod.js app/main.prod.js.map app/renderer.prod.js app/renderer.prod.js.map -app/style.css -app/style.css.map -app/utils/bech32.js +app/lib/utils/bech32.js dist dll main.js diff --git a/.flowconfig b/.flowconfig index 2082d04b..0a2cad75 100644 --- a/.flowconfig +++ b/.flowconfig @@ -24,5 +24,6 @@ module.name_mapper.extension='styl' -> '/internals/flow/CSSModule. module.name_mapper.extension='scss' -> '/internals/flow/CSSModule.js.flow' module.name_mapper.extension='png' -> '/internals/flow/WebpackAsset.js.flow' module.name_mapper.extension='jpg' -> '/internals/flow/WebpackAsset.js.flow' +module.system.node.resolve_dirname=app suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe suppress_comment=\\(.\\|\n\\)*\\$FlowIssue diff --git a/app/components/Activity/InvoiceModal.js b/app/components/Activity/InvoiceModal.js index 8939b947..9836ff8c 100644 --- a/app/components/Activity/InvoiceModal.js +++ b/app/components/Activity/InvoiceModal.js @@ -5,7 +5,7 @@ import Moment from 'react-moment' import QRCode from 'qrcode.react' import copy from 'copy-to-clipboard' -import { showNotification } from 'notifications' +import { showNotification } from 'lib/utils/notifications' import FaAngleDown from 'react-icons/lib/fa/angle-down' diff --git a/app/components/Activity/TransactionModal.js b/app/components/Activity/TransactionModal.js index 3d8c4e0b..eb5ff8b3 100644 --- a/app/components/Activity/TransactionModal.js +++ b/app/components/Activity/TransactionModal.js @@ -9,7 +9,7 @@ import Isvg from 'react-inlinesvg' import paperPlane from 'icons/paper_plane.svg' import hand from 'icons/hand.svg' import link from 'icons/link.svg' -import { blockExplorer } from 'utils' +import { blockExplorer } from 'lib/utils' import Value from 'components/Value' diff --git a/app/components/Contacts/ContactModal.js b/app/components/Contacts/ContactModal.js index 0b13c381..42fcb3f6 100644 --- a/app/components/Contacts/ContactModal.js +++ b/app/components/Contacts/ContactModal.js @@ -4,7 +4,7 @@ import ReactModal from 'react-modal' import FaCircle from 'react-icons/lib/fa/circle' import MdClose from 'react-icons/lib/md/close' -import { btc } from 'utils' +import { btc } from 'lib/utils' import styles from './ContactModal.scss' diff --git a/app/components/Contacts/Network.js b/app/components/Contacts/Network.js index 409cfe11..49d42958 100644 --- a/app/components/Contacts/Network.js +++ b/app/components/Contacts/Network.js @@ -5,7 +5,7 @@ import FaExternalLink from 'react-icons/lib/fa/external-link' import FaCircle from 'react-icons/lib/fa/circle' import FaRepeat from 'react-icons/lib/fa/repeat' import FaAngleDown from 'react-icons/lib/fa/angle-down' -import { btc, blockExplorer } from 'utils' +import { btc, blockExplorer } from 'lib/utils' import plus from 'icons/plus.svg' import search from 'icons/search.svg' diff --git a/app/components/Form/Pay.js b/app/components/Form/Pay.js index 4cc4053f..a3b378c5 100644 --- a/app/components/Form/Pay.js +++ b/app/components/Form/Pay.js @@ -6,7 +6,7 @@ import paperPlane from 'icons/paper_plane.svg' import link from 'icons/link.svg' import FaAngleDown from 'react-icons/lib/fa/angle-down' -import { btc } from 'utils' +import { btc } from 'lib/utils' import styles from './Pay.scss' diff --git a/app/components/Form/Request.js b/app/components/Form/Request.js index 385af043..accbf5ff 100644 --- a/app/components/Form/Request.js +++ b/app/components/Form/Request.js @@ -5,7 +5,7 @@ import Isvg from 'react-inlinesvg' import hand from 'icons/hand.svg' import FaAngleDown from 'react-icons/lib/fa/angle-down' -import { btc } from 'utils' +import { btc } from 'lib/utils' import styles from './Request.scss' const Request = ({ diff --git a/app/components/Onboarding/Syncing.js b/app/components/Onboarding/Syncing.js index 0bf0ca71..9337acff 100644 --- a/app/components/Onboarding/Syncing.js +++ b/app/components/Onboarding/Syncing.js @@ -5,7 +5,7 @@ import copy from 'copy-to-clipboard' import Isvg from 'react-inlinesvg' import zapLogo from 'icons/zap_logo.svg' import copyIcon from 'icons/copy.svg' -import { showNotification } from 'notifications' +import { showNotification } from 'lib/utils/notifications' import styles from './Syncing.scss' class Syncing extends Component { diff --git a/app/components/Value/Value.js b/app/components/Value/Value.js index 8385dbac..66745484 100644 --- a/app/components/Value/Value.js +++ b/app/components/Value/Value.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { btc } from 'utils' +import { btc } from 'lib/utils' const Value = ({ value, currency, currentTicker }) => { if (currency === 'sats') { diff --git a/app/components/Wallet/ReceiveModal.js b/app/components/Wallet/ReceiveModal.js index 83874282..ea7f08c7 100644 --- a/app/components/Wallet/ReceiveModal.js +++ b/app/components/Wallet/ReceiveModal.js @@ -6,7 +6,7 @@ import copyIcon from 'icons/copy.svg' import Isvg from 'react-inlinesvg' import x from 'icons/x.svg' -import { showNotification } from 'notifications' +import { showNotification } from 'lib/utils/notifications' import styles from './ReceiveModal.scss' diff --git a/app/components/Wallet/Wallet.js b/app/components/Wallet/Wallet.js index cfc50842..429fffb3 100644 --- a/app/components/Wallet/Wallet.js +++ b/app/components/Wallet/Wallet.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import FaAngleDown from 'react-icons/lib/fa/angle-down' import Isvg from 'react-inlinesvg' -import { btc, blockExplorer } from 'utils' +import { btc, blockExplorer } from 'lib/utils' import Value from 'components/Value' import AnimatedCheckmark from 'components/AnimatedCheckmark' diff --git a/app/containers/Root.js b/app/containers/Root.js index 0405f19b..edc6eaf1 100644 --- a/app/containers/Root.js +++ b/app/containers/Root.js @@ -4,9 +4,6 @@ import { Provider, connect } from 'react-redux' import { ConnectedRouter } from 'react-router-redux' import PropTypes from 'prop-types' -import LoadingBolt from '../components/LoadingBolt' -import Onboarding from '../components/Onboarding' -import Syncing from '../components/Onboarding/Syncing' import { setConnectionType, setConnectionString, @@ -29,9 +26,12 @@ import { updateReEnterSeedInput, updateRecoverSeedInput, setReEnterSeedIndexes -} from '../reducers/onboarding' -import { lndSelectors } from '../reducers/lnd' -import { walletAddress } from '../reducers/address' +} from 'reducers/onboarding' +import { lndSelectors } from 'reducers/lnd' +import { walletAddress } from 'reducers/address' +import LoadingBolt from 'components/LoadingBolt' +import Onboarding from 'components/Onboarding' +import Syncing from 'components/Onboarding/Syncing' import Routes from '../routes' const mapDispatchToProps = { diff --git a/app/lnd/config/index.js b/app/lib/lnd/config.js similarity index 100% rename from app/lnd/config/index.js rename to app/lib/lnd/config.js diff --git a/app/lnd/index.js b/app/lib/lnd/index.js similarity index 91% rename from app/lnd/index.js rename to app/lib/lnd/index.js index 404e5a3b..25bae332 100644 --- a/app/lnd/index.js +++ b/app/lib/lnd/index.js @@ -1,5 +1,5 @@ import config from './config' -import walletUnlocker from './lib/walletUnlocker' +import walletUnlocker from './walletUnlocker' import walletUnlockerMethods from './walletUnlockerMethods' // use mainLog because lndLog is reserved for the lnd binary itself import { mainLog } from '../utils/log' diff --git a/app/lnd/lib/lightning.js b/app/lib/lnd/lightning.js similarity index 91% rename from app/lnd/lib/lightning.js rename to app/lib/lnd/lightning.js index fc28979e..a0e835a8 100644 --- a/app/lnd/lib/lightning.js +++ b/app/lib/lnd/lightning.js @@ -1,12 +1,12 @@ import grpc from 'grpc' import { loadSync } from '@grpc/proto-loader' -import config from '../config' +import config from './config' import { getDeadline, validateHost, createSslCreds, createMacaroonCreds } from './util' -import methods from '../methods' -import { mainLog } from '../../utils/log' -import subscribeToTransactions from '../subscribe/transactions' -import subscribeToInvoices from '../subscribe/invoices' -import subscribeToChannelGraph from '../subscribe/channelgraph' +import methods from './methods' +import { mainLog } from '../utils/log' +import subscribeToTransactions from './subscribe/transactions' +import subscribeToInvoices from './subscribe/invoices' +import subscribeToChannelGraph from './subscribe/channelgraph' /** * Creates an LND grpc client lightning service. diff --git a/app/lnd/methods/channelController.js b/app/lib/lnd/methods/channelController.js similarity index 100% rename from app/lnd/methods/channelController.js rename to app/lib/lnd/methods/channelController.js diff --git a/app/lnd/methods/index.js b/app/lib/lnd/methods/index.js similarity index 100% rename from app/lnd/methods/index.js rename to app/lib/lnd/methods/index.js diff --git a/app/lnd/methods/invoicesController.js b/app/lib/lnd/methods/invoicesController.js similarity index 100% rename from app/lnd/methods/invoicesController.js rename to app/lib/lnd/methods/invoicesController.js diff --git a/app/lnd/methods/networkController.js b/app/lib/lnd/methods/networkController.js similarity index 100% rename from app/lnd/methods/networkController.js rename to app/lib/lnd/methods/networkController.js diff --git a/app/lnd/methods/paymentsController.js b/app/lib/lnd/methods/paymentsController.js similarity index 100% rename from app/lnd/methods/paymentsController.js rename to app/lib/lnd/methods/paymentsController.js diff --git a/app/lnd/methods/peersController.js b/app/lib/lnd/methods/peersController.js similarity index 100% rename from app/lnd/methods/peersController.js rename to app/lib/lnd/methods/peersController.js diff --git a/app/lnd/methods/walletController.js b/app/lib/lnd/methods/walletController.js similarity index 100% rename from app/lnd/methods/walletController.js rename to app/lib/lnd/methods/walletController.js diff --git a/app/lnd/lib/neutrino.js b/app/lib/lnd/neutrino.js similarity index 98% rename from app/lnd/lib/neutrino.js rename to app/lib/lnd/neutrino.js index acf4cb70..a878d262 100644 --- a/app/lnd/lib/neutrino.js +++ b/app/lib/lnd/neutrino.js @@ -1,8 +1,8 @@ import split2 from 'split2' import { spawn } from 'child_process' import EventEmitter from 'events' -import config from '../config' -import { mainLog, lndLog, lndLogGetLevel } from '../../utils/log' +import config from './config' +import { mainLog, lndLog, lndLogGetLevel } from '../utils/log' import { fetchBlockHeight } from './util' // Sync statuses diff --git a/app/lnd/push/closechannel.js b/app/lib/lnd/push/closechannel.js similarity index 100% rename from app/lnd/push/closechannel.js rename to app/lib/lnd/push/closechannel.js diff --git a/app/lnd/push/openchannel.js b/app/lib/lnd/push/openchannel.js similarity index 100% rename from app/lnd/push/openchannel.js rename to app/lib/lnd/push/openchannel.js diff --git a/app/lnd/push/subscribeinvoice.js b/app/lib/lnd/push/subscribeinvoice.js similarity index 100% rename from app/lnd/push/subscribeinvoice.js rename to app/lib/lnd/push/subscribeinvoice.js diff --git a/app/lnd/subscribe/channelgraph.js b/app/lib/lnd/subscribe/channelgraph.js similarity index 100% rename from app/lnd/subscribe/channelgraph.js rename to app/lib/lnd/subscribe/channelgraph.js diff --git a/app/lnd/subscribe/invoices.js b/app/lib/lnd/subscribe/invoices.js similarity index 100% rename from app/lnd/subscribe/invoices.js rename to app/lib/lnd/subscribe/invoices.js diff --git a/app/lnd/subscribe/transactions.js b/app/lib/lnd/subscribe/transactions.js similarity index 100% rename from app/lnd/subscribe/transactions.js rename to app/lib/lnd/subscribe/transactions.js diff --git a/app/lnd/lib/util.js b/app/lib/lnd/util.js similarity index 99% rename from app/lnd/lib/util.js rename to app/lib/lnd/util.js index 381939cb..1f21b75f 100644 --- a/app/lnd/lib/util.js +++ b/app/lib/lnd/util.js @@ -8,7 +8,7 @@ import grpc from 'grpc' import isIP from 'validator/lib/isIP' import isPort from 'validator/lib/isPort' import get from 'lodash.get' -import { mainLog } from '../../utils/log' +import { mainLog } from '../utils/log' const fsReadFile = promisify(fs.readFile) const dnsLookup = promisify(dns.lookup) diff --git a/app/lnd/lib/walletUnlocker.js b/app/lib/lnd/walletUnlocker.js similarity index 96% rename from app/lnd/lib/walletUnlocker.js rename to app/lib/lnd/walletUnlocker.js index f30b93d3..ae2ae372 100644 --- a/app/lnd/lib/walletUnlocker.js +++ b/app/lib/lnd/walletUnlocker.js @@ -1,7 +1,7 @@ import fs from 'fs' import grpc from 'grpc' import { loadSync } from '@grpc/proto-loader' -import config from '../config' +import config from './config' const walletUnlocker = (rpcpath, host) => { const lndConfig = config.lnd() diff --git a/app/lnd/walletUnlockerMethods/index.js b/app/lib/lnd/walletUnlockerMethods/index.js similarity index 100% rename from app/lnd/walletUnlockerMethods/index.js rename to app/lib/lnd/walletUnlockerMethods/index.js diff --git a/app/api/index.js b/app/lib/utils/api.js similarity index 100% rename from app/api/index.js rename to app/lib/utils/api.js diff --git a/app/utils/bech32.js b/app/lib/utils/bech32.js similarity index 100% rename from app/utils/bech32.js rename to app/lib/utils/bech32.js diff --git a/app/utils/blockExplorer.js b/app/lib/utils/blockExplorer.js similarity index 100% rename from app/utils/blockExplorer.js rename to app/lib/utils/blockExplorer.js diff --git a/app/utils/btc.js b/app/lib/utils/btc.js similarity index 100% rename from app/utils/btc.js rename to app/lib/utils/btc.js diff --git a/app/utils/index.js b/app/lib/utils/index.js similarity index 100% rename from app/utils/index.js rename to app/lib/utils/index.js diff --git a/app/utils/log.js b/app/lib/utils/log.js similarity index 100% rename from app/utils/log.js rename to app/lib/utils/log.js diff --git a/app/notifications/index.js b/app/lib/utils/notifications.js similarity index 100% rename from app/notifications/index.js rename to app/lib/utils/notifications.js diff --git a/app/utils/usd.js b/app/lib/utils/usd.js similarity index 100% rename from app/utils/usd.js rename to app/lib/utils/usd.js diff --git a/app/zap.js b/app/lib/zap/controller.js similarity index 98% rename from app/zap.js rename to app/lib/zap/controller.js index 25fea67a..638a73d3 100644 --- a/app/zap.js +++ b/app/lib/zap/controller.js @@ -1,11 +1,11 @@ import { app, ipcMain, dialog } from 'electron' import Store from 'electron-store' import StateMachine from 'javascript-state-machine' -import lnd from './lnd' -import Neutrino from './lnd/lib/neutrino' -import Lightning from './lnd/lib/lightning' -import { mainLog } from './utils/log' -import { isLndRunning } from './lnd/lib/util' +import lnd from '../lnd' +import Neutrino from '../lnd/neutrino' +import Lightning from '../lnd/lightning' +import { mainLog } from '../utils/log' +import { isLndRunning } from '../lnd/util' const grpcSslCipherSuites = connectionType => (connectionType === 'btcpayserver' diff --git a/app/menu.js b/app/lib/zap/menuBuilder.js similarity index 99% rename from app/menu.js rename to app/lib/zap/menuBuilder.js index 23376f0a..96b461a7 100644 --- a/app/menu.js +++ b/app/lib/zap/menuBuilder.js @@ -1,7 +1,7 @@ // @flow import { app, Menu, shell, BrowserWindow } from 'electron' -export default class MenuBuilder { +export default class ZapMenuBuilder { mainWindow: BrowserWindow constructor(mainWindow: BrowserWindow) { diff --git a/app/updater.js b/app/lib/zap/updater.js similarity index 96% rename from app/updater.js rename to app/lib/zap/updater.js index cb9bb714..0431bb9d 100644 --- a/app/updater.js +++ b/app/lib/zap/updater.js @@ -1,6 +1,6 @@ import { dialog } from 'electron' import { autoUpdater } from 'electron-updater' -import { updaterLog } from './utils/log' +import { updaterLog } from '../utils/log' autoUpdater.logger = updaterLog diff --git a/app/main.dev.js b/app/main.dev.js index af82dbf7..1765d7de 100644 --- a/app/main.dev.js +++ b/app/main.dev.js @@ -7,10 +7,10 @@ * `./app/main.prod.js` using webpack. This gives us some performance wins. */ import { app, BrowserWindow, session } from 'electron' -import { mainLog } from './utils/log' -import MenuBuilder from './menu' -import ZapController from './zap' -import ZapUpdater from './updater' +import { mainLog } from './lib/utils/log' +import ZapMenuBuilder from './lib/zap/menuBuilder' +import ZapController from './lib/zap/controller' +import ZapUpdater from './lib/zap/updater' // Set up a couple of timers to track the app startup progress. mainLog.time('Time until app is ready') @@ -41,7 +41,7 @@ app.on('ready', () => { zap.init() // Initialise the application menus. - const menuBuilder = new MenuBuilder(mainWindow) + const menuBuilder = new ZapMenuBuilder(mainWindow) menuBuilder.buildMenu() /** diff --git a/app/reducers/channels.js b/app/reducers/channels.js index bde39df5..5402a4ea 100644 --- a/app/reducers/channels.js +++ b/app/reducers/channels.js @@ -1,9 +1,10 @@ import { createSelector } from 'reselect' import { ipcRenderer } from 'electron' -import { showNotification } from '../notifications' -import { btc } from '../utils' -import { requestSuggestedNodes } from '../api' +import { btc } from 'lib/utils' +import { showNotification } from 'lib/utils/notifications' +import { requestSuggestedNodes } from 'lib/utils/api' import { setError } from './error' + // ------------------------------------ // Constants // ------------------------------------ diff --git a/app/reducers/contactsform.js b/app/reducers/contactsform.js index 7c94e749..925c2ae6 100644 --- a/app/reducers/contactsform.js +++ b/app/reducers/contactsform.js @@ -1,7 +1,6 @@ import { createSelector } from 'reselect' - +import { btc } from 'lib/utils' import { tickerSelectors } from './ticker' -import { btc } from '../utils' // Initial State const initialState = { diff --git a/app/reducers/invoice.js b/app/reducers/invoice.js index 4ab41be7..891a1f3e 100644 --- a/app/reducers/invoice.js +++ b/app/reducers/invoice.js @@ -2,6 +2,9 @@ import { createSelector } from 'reselect' import { ipcRenderer } from 'electron' import { push } from 'react-router-redux' +import { showNotification } from 'lib/utils/notifications' +import { btc } from 'lib/utils' + import { showActivityModal } from './activity' import { fetchBalance } from './balance' import { setFormType } from './form' @@ -9,8 +12,6 @@ import { setPayInvoice } from './payform' import { resetRequestForm } from './requestform' import { setError } from './error' -import { showNotification } from '../notifications' -import { btc } from '../utils' // ------------------------------------ // Constants // ------------------------------------ diff --git a/app/reducers/lnd.js b/app/reducers/lnd.js index 9b57f871..4e42d97a 100644 --- a/app/reducers/lnd.js +++ b/app/reducers/lnd.js @@ -1,9 +1,9 @@ import Store from 'electron-store' import { createSelector } from 'reselect' +import { showNotification } from 'lib/utils/notifications' import { fetchTicker } from './ticker' import { fetchBalance } from './balance' import { fetchInfo, setHasSynced } from './info' -import { showNotification } from '../notifications' // ------------------------------------ // Constants // ------------------------------------ diff --git a/app/reducers/network.js b/app/reducers/network.js index e4e7b705..f61e0681 100644 --- a/app/reducers/network.js +++ b/app/reducers/network.js @@ -1,6 +1,6 @@ import { createSelector } from 'reselect' import { ipcRenderer } from 'electron' -import { bech32 } from '../utils' +import { bech32 } from 'lib/utils' // ------------------------------------ // Constants diff --git a/app/reducers/payform.js b/app/reducers/payform.js index 7c51f5d9..3961bc71 100644 --- a/app/reducers/payform.js +++ b/app/reducers/payform.js @@ -1,10 +1,9 @@ import { createSelector } from 'reselect' import bitcoin from 'bitcoinjs-lib' - +import { btc, bech32 } from 'lib/utils' import { setFormType } from './form' import { tickerSelectors } from './ticker' import { infoSelectors } from './info' -import { btc, bech32 } from '../utils' // Initial State const initialState = { diff --git a/app/reducers/requestform.js b/app/reducers/requestform.js index 907610ef..43573a6f 100644 --- a/app/reducers/requestform.js +++ b/app/reducers/requestform.js @@ -1,5 +1,5 @@ import { createSelector } from 'reselect' -import { btc } from '../utils' +import { btc } from 'lib/utils' import { tickerSelectors } from './ticker' // Initial State diff --git a/app/reducers/ticker.js b/app/reducers/ticker.js index a6a50ca1..aa567a06 100644 --- a/app/reducers/ticker.js +++ b/app/reducers/ticker.js @@ -1,5 +1,5 @@ import { createSelector } from 'reselect' -import { requestTickers } from '../api' +import { requestTickers } from 'lib/utils/api' import { infoSelectors } from './info' // ------------------------------------ diff --git a/app/reducers/transaction.js b/app/reducers/transaction.js index 28d4af81..c5487b40 100644 --- a/app/reducers/transaction.js +++ b/app/reducers/transaction.js @@ -1,6 +1,6 @@ import { ipcRenderer } from 'electron' -import { showNotification } from '../notifications' -import { btc } from '../utils' +import { showNotification } from 'lib/utils/notifications' +import { btc } from 'lib/utils' import { newAddress } from './address' import { fetchBalance } from './balance' import { setFormType } from './form' diff --git a/app/routes/activity/components/components/Invoice/Invoice.js b/app/routes/activity/components/components/Invoice/Invoice.js index 5c12649f..cdf4a4b8 100644 --- a/app/routes/activity/components/components/Invoice/Invoice.js +++ b/app/routes/activity/components/components/Invoice/Invoice.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import Moment from 'react-moment' -import { btc } from 'utils' +import { btc } from 'lib/utils' import Isvg from 'react-inlinesvg' import Value from 'components/Value' diff --git a/app/routes/activity/components/components/Payment/Payment.js b/app/routes/activity/components/components/Payment/Payment.js index f4426d31..565aa95c 100644 --- a/app/routes/activity/components/components/Payment/Payment.js +++ b/app/routes/activity/components/components/Payment/Payment.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import Isvg from 'react-inlinesvg' import zap from 'icons/zap.svg' -import { btc } from 'utils' +import { btc } from 'lib/utils' import Value from 'components/Value' import styles from '../Activity.scss' diff --git a/app/routes/activity/components/components/Transaction/Transaction.js b/app/routes/activity/components/components/Transaction/Transaction.js index c2072151..45ff6a4a 100644 --- a/app/routes/activity/components/components/Transaction/Transaction.js +++ b/app/routes/activity/components/components/Transaction/Transaction.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types' import Moment from 'react-moment' import Isvg from 'react-inlinesvg' import link from 'icons/link.svg' -import { btc } from 'utils' +import { btc } from 'lib/utils' import Value from 'components/Value' import styles from '../Activity.scss' diff --git a/app/routes/app/containers/AppContainer.js b/app/routes/app/containers/AppContainer.js index 5aeb6eba..b00c4806 100644 --- a/app/routes/app/containers/AppContainer.js +++ b/app/routes/app/containers/AppContainer.js @@ -1,7 +1,7 @@ import { withRouter } from 'react-router' import { connect } from 'react-redux' -import { btc } from 'utils' +import { btc } from 'lib/utils' import { fetchTicker, setCurrency, tickerSelectors } from 'reducers/ticker' diff --git a/app/utils/.gitkeep b/app/utils/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/test/utils/usd.spec.js b/test/utils/usd.spec.js index c00f0922..18044f45 100644 --- a/test/utils/usd.spec.js +++ b/test/utils/usd.spec.js @@ -1,4 +1,4 @@ -import { formatUsd, usdToBtc } from '../../app/utils/usd' +import { formatUsd, usdToBtc } from 'lib/utils/usd' describe('usd', () => { describe('formatUsd', () => { diff --git a/webpack.config.renderer.dev.js b/webpack.config.renderer.dev.js index 2c87deb6..438846ce 100644 --- a/webpack.config.renderer.dev.js +++ b/webpack.config.renderer.dev.js @@ -20,7 +20,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin' import AddAssetHtmlPlugin from 'add-asset-html-webpack-plugin' import CspHtmlWebpackPlugin from 'csp-html-webpack-plugin' import baseConfig from './webpack.config.base' -import { mainLog } from './app/utils/log' +import { mainLog } from './app/lib/utils/log' const port = process.env.PORT || 1212 const publicPath = `http://localhost:${port}/dist`