From 96c47debab73f686ee6e05dd6c78ae8538bce475 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 11 Feb 2014 18:18:01 -0300 Subject: [PATCH] fixed tests after merge --- config/config.js | 15 ++++++++++++--- lib/TransactionDb.js | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/config.js b/config/config.js index a27d4d3..ec1473e 100644 --- a/config/config.js +++ b/config/config.js @@ -29,6 +29,17 @@ switch(process.env.NODE_ENV) { break; } +var dataDir = process.env.BITCOIND_DATADIR; +var isWin = /^win/.test(process.platform); +var isMac = /^darwin/.test(process.platform); +var isLinux = /^linux/.test(process.platform); +if (!dataDir) { + if (isWin) dataDir = '%APPDATA%\\Bitcoin\\'; + if (isMac) dataDir = process.env.HOME + '/Library/Application Support/Bitcoin/'; + if (isLinux) dataDir = process.env.HOME + '/.bitcoin/'; +} +dataDir += ((process.env.INSIGHT_NETWORK || 'testnet')==='testnet'?'testnet3':''); + module.exports = { root: rootPath, appName: 'Insight ' + env, @@ -41,9 +52,7 @@ module.exports = { host: process.env.BITCOIND_HOST || '127.0.0.1', port: b_port, p2pPort: p2p_port, - dataDir: (process.env.BITCOIND_DATADIR + - ((process.env.INSIGHT_NETWORK || 'testnet')==='testnet'?'testnet3':'')), - + dataDir: dataDir, // DO NOT CHANGE THIS! disableAgent: true }, diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js index 02fa1fd..05b3e46 100644 --- a/lib/TransactionDb.js +++ b/lib/TransactionDb.js @@ -475,7 +475,7 @@ function spec(b) { } else { - console.log ('WARN in TX: %s could not parse OUTPUT %d', tx.txid, o.n); + //console.log ('WARN in TX: %s could not parse OUTPUT %d', tx.txid, o.n); return next_out(); } },