From bce0ca4fcd3fda1f488a70a6077325b8c89196a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Mon, 28 Apr 2014 13:52:15 +0200 Subject: [PATCH 1/3] Remove `lamassu-mtgox` dependency --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index a8b0752e..32e0b2d1 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "pg": "~2.11.1", "lamassu-bitpay": "0.0.2", "lamassu-bitstamp": "0.0.4", - "lamassu-mtgox": "~0.0.1", "lamassu-blockchain": "~0.1.0", "morgan": "~1.0.0" }, From cf19be36935a93bed8c778300a0c53556ab47af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Mon, 28 Apr 2014 15:07:57 +0200 Subject: [PATCH 2/3] Remove the old custom ticker --- lib/protocol/exchanges/custom_ticker.js | 45 ------------------------- 1 file changed, 45 deletions(-) delete mode 100644 lib/protocol/exchanges/custom_ticker.js diff --git a/lib/protocol/exchanges/custom_ticker.js b/lib/protocol/exchanges/custom_ticker.js deleted file mode 100644 index e8a61228..00000000 --- a/lib/protocol/exchanges/custom_ticker.js +++ /dev/null @@ -1,45 +0,0 @@ -'use strict'; - -// TODO: refactor this with bitpay_ticker.js - -var https = require('https'); -var _ = require('underscore'); - -var CustomTicker = function(config) { - this.config = config; -}; - -CustomTicker.factory = function factory(config) { - return new CustomTicker(config); -}; - -CustomTicker.prototype.ticker = function ticker(currency, cb) { - var self = this; - https.get(this.config.uri, function(res) { - var buf = ''; - res.setEncoding('utf8'); - res.on('data', function(chunk) { - buf += chunk; - }) - .on('end', function() { - var json = null; - try { - json = JSON.parse(buf); - } catch(e) { - cb(new Error('Couldn\'t parse JSON response')); - return; - } - var rec = _.findWhere(json, {code: currency}); - - if (!rec) { - cb(new Error('Currency not listed: ' + currency)); - return; - } - cb(null, rec.rate); - }); - }).on('error', function(e) { - cb(e); - }); -}; - -module.exports = CustomTicker; From 5d7f4fbc7b3366a5246f1664254544d8945c1cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Mon, 28 Apr 2014 15:09:10 +0200 Subject: [PATCH 3/3] Remove special case for exchange require --- lib/trader.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/trader.js b/lib/trader.js index 6fbab1db..ff82b08a 100644 --- a/lib/trader.js +++ b/lib/trader.js @@ -25,19 +25,7 @@ var Trader = module.exports = function (db) { }; Trader.prototype._findExchange = function (name) { - var exchange; - - try { - exchange = require('lamassu-' + name); - } catch (err) { - if (!err.message.match(/Cannot find module/)) { - throw err; - } - - exchange = require(path.join(path.dirname(__dirname), 'exchanges', name)); - } - - return exchange; + return require('lamassu-' + name); }; Trader.prototype._findTicker = function (name) {