fixed tests after merge
This commit is contained in:
parent
dad357c388
commit
96c47debab
|
@ -29,6 +29,17 @@ switch(process.env.NODE_ENV) {
|
||||||
break;
|
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 = {
|
module.exports = {
|
||||||
root: rootPath,
|
root: rootPath,
|
||||||
appName: 'Insight ' + env,
|
appName: 'Insight ' + env,
|
||||||
|
@ -41,9 +52,7 @@ module.exports = {
|
||||||
host: process.env.BITCOIND_HOST || '127.0.0.1',
|
host: process.env.BITCOIND_HOST || '127.0.0.1',
|
||||||
port: b_port,
|
port: b_port,
|
||||||
p2pPort: p2p_port,
|
p2pPort: p2p_port,
|
||||||
dataDir: (process.env.BITCOIND_DATADIR +
|
dataDir: dataDir,
|
||||||
((process.env.INSIGHT_NETWORK || 'testnet')==='testnet'?'testnet3':'')),
|
|
||||||
|
|
||||||
// DO NOT CHANGE THIS!
|
// DO NOT CHANGE THIS!
|
||||||
disableAgent: true
|
disableAgent: true
|
||||||
},
|
},
|
||||||
|
|
|
@ -475,7 +475,7 @@ function spec(b) {
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
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();
|
return next_out();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue