From fc4af4885aa391d45bfbfa0ba29b2f9b18ded523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 22 Jun 2021 20:07:29 +0100 Subject: [PATCH] fix: remove blockchain utils module --- lib/blockchain-utils.js | 7 ------- lib/blockchain/install.js | 8 ++++---- lib/plugins/wallet/bitcoincashd/bitcoincashd.js | 4 ++-- lib/plugins/wallet/bitcoind/bitcoind.js | 4 ++-- lib/plugins/wallet/dashd/dashd.js | 4 ++-- lib/plugins/wallet/litecoind/litecoind.js | 4 ++-- lib/plugins/wallet/zcashd/zcashd.js | 4 ++-- 7 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 lib/blockchain-utils.js diff --git a/lib/blockchain-utils.js b/lib/blockchain-utils.js deleted file mode 100644 index 0f02a2b3..00000000 --- a/lib/blockchain-utils.js +++ /dev/null @@ -1,7 +0,0 @@ -const options = require('./options') - -function blockchainDir () { - return options.blockchainDir -} - -module.exports = { blockchainDir } diff --git a/lib/blockchain/install.js b/lib/blockchain/install.js index 3671bd34..8a71a826 100644 --- a/lib/blockchain/install.js +++ b/lib/blockchain/install.js @@ -8,7 +8,7 @@ const inquirer = require('inquirer') const _ = require('lodash/fp') const { utils: coinUtils } = require('lamassu-coins') -const blockchainUtils = require('../blockchain-utils') +const options = require('../options') const common = require('./common') const doVolume = require('./do-volume') @@ -29,7 +29,7 @@ const PLUGINS = { module.exports = {run} function installedVolumeFilePath (crypto) { - return path.resolve(coinUtils.cryptoDir(crypto, blockchainUtils.blockchainDir()), '.installed') + return path.resolve(coinUtils.cryptoDir(crypto, options.blockchainDir), '.installed') } function isInstalledVolume (crypto) { @@ -59,7 +59,7 @@ function processCryptos (codes) { _.forEach(setupCrypto, selectedCryptos) common.es('sudo service supervisor restart') - const blockchainDir = blockchainUtils.blockchainDir() + const blockchainDir = options.blockchainDir const backupDir = path.resolve(os.homedir(), 'backups') const rsyncCmd = `( \ (crontab -l 2>/dev/null || echo -n "") | grep -v "@daily rsync ".*"wallet.dat"; \ @@ -74,7 +74,7 @@ function processCryptos (codes) { function setupCrypto (crypto) { logger.info(`Installing ${crypto.display}...`) - const cryptoDir = coinUtils.cryptoDir(crypto, blockchainUtils.blockchainDir()) + const cryptoDir = coinUtils.cryptoDir(crypto, options.blockchainDir) makeDir.sync(cryptoDir) const cryptoPlugin = plugin(crypto) const oldDir = process.cwd() diff --git a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js index c666e4e0..d6581ea6 100644 --- a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js +++ b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js @@ -1,13 +1,13 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') -const blockchainUtils = require('../../../blockchain-utils') +const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const { utils: coinUtils } = require('lamassu-coins') const cryptoRec = coinUtils.getCryptoCurrency('BCH') -const configPath = coinUtils.configPath(cryptoRec, blockchainUtils.blockchainDir()) +const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale function rpcConfig () { diff --git a/lib/plugins/wallet/bitcoind/bitcoind.js b/lib/plugins/wallet/bitcoind/bitcoind.js index 0c04f52c..a24a4d36 100644 --- a/lib/plugins/wallet/bitcoind/bitcoind.js +++ b/lib/plugins/wallet/bitcoind/bitcoind.js @@ -1,13 +1,13 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') -const blockchainUtils = require('../../../blockchain-utils') +const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const { utils: coinUtils } = require('lamassu-coins') const cryptoRec = coinUtils.getCryptoCurrency('BTC') -const configPath = coinUtils.configPath(cryptoRec, blockchainUtils.blockchainDir()) +const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale function rpcConfig () { diff --git a/lib/plugins/wallet/dashd/dashd.js b/lib/plugins/wallet/dashd/dashd.js index abc7288c..c8379413 100644 --- a/lib/plugins/wallet/dashd/dashd.js +++ b/lib/plugins/wallet/dashd/dashd.js @@ -3,12 +3,12 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const blockchainUtils = require('../../../blockchain-utils') +const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const cryptoRec = coinUtils.getCryptoCurrency('DASH') -const configPath = coinUtils.configPath(cryptoRec, blockchainUtils.blockchainDir()) +const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale function rpcConfig () { diff --git a/lib/plugins/wallet/litecoind/litecoind.js b/lib/plugins/wallet/litecoind/litecoind.js index aa5a5d7c..534c70a2 100644 --- a/lib/plugins/wallet/litecoind/litecoind.js +++ b/lib/plugins/wallet/litecoind/litecoind.js @@ -3,12 +3,12 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const blockchainUtils = require('../../../blockchain-utils') +const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const cryptoRec = coinUtils.getCryptoCurrency('LTC') -const configPath = coinUtils.configPath(cryptoRec, blockchainUtils.blockchainDir()) +const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale function rpcConfig () { diff --git a/lib/plugins/wallet/zcashd/zcashd.js b/lib/plugins/wallet/zcashd/zcashd.js index 4c40e73a..cd7959f4 100644 --- a/lib/plugins/wallet/zcashd/zcashd.js +++ b/lib/plugins/wallet/zcashd/zcashd.js @@ -4,12 +4,12 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const blockchainUtils = require('../../../blockchain-utils') +const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const cryptoRec = coinUtils.getCryptoCurrency('ZEC') -const configPath = coinUtils.configPath(cryptoRec, blockchainUtils.blockchainDir()) +const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale function rpcConfig () {