Merge branch 'master' into merge-master

This commit is contained in:
Josh Harvey 2014-05-03 17:03:55 -04:00
commit 9ac399ea3b
2 changed files with 1 additions and 58 deletions

View file

@ -21,19 +21,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) {