diff --git a/lib/plugins.js b/lib/plugins.js index 7f9a589b..c3012ca9 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -1,7 +1,5 @@ 'use strict'; -var fs = require('fs'); - var _ = require('lodash'); var async = require('async'); var logger = require('./logger'); @@ -14,7 +12,6 @@ var PENDING_TIMEOUT = 70 * 1000; // TODO: might have to update this if user is allowed to extend monitoring time var DEPOSIT_TIMEOUT = 130 * 1000; - var db = null; var tickerPlugin = null; @@ -38,13 +35,6 @@ var reapTxInterval = null; var tradesQueue = []; -var cartridges = null; -try { - cartridges = JSON.parse(fs.readFileSync('./cartridges.json')); -} catch (ex) { - logger.warn('No cartridges.json file found: ' + ex.message); -} - // that's basically a constructor exports.init = function init(databaseHandle) { if (!databaseHandle) { @@ -198,19 +188,21 @@ exports.logEvent = function event(session, rawEvent) { }; function buildCartridges(counts) { + var cartridges = cachedConfig.exchanges.settings.cartridges; + var virtualCartridges = cachedConfig.exchanges.settings.virtualCartridges; if (!cartridges) return null; return { cartridges: [ { - denomination: cartridges.cartridges[0], + denomination: cartridges[0], count: counts[0] }, { - denomination: cartridges.cartridges[1], + denomination: cartridges[1], count: counts[1] }, ], - virtualCartridges: cartridges.virtualCartridges + virtualCartridges: virtualCartridges }; }