zcash-hackworks
/
insight-ui-zcash
mirror of https://github.com/zcash-hackworks/insight-ui-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed tests after merge

This commit is contained in:
Manuel Araoz 2014-02-11 18:18:01 -03:00
parent dad357c388
commit 96c47debab
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/config.js
View File

@ -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
},

2
lib/TransactionDb.js
View File

@ -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();
}
},