RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: updates for npm install

Browse Source
This commit is contained in:
Braydon Fuller 2016-04-07 16:22:54 -04:00
parent 1fb552a972
commit 7c344b5f24
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration/p2p.js
View File

@ -1,5 +1,6 @@
'use strict'; 'use strict';
var path = require('path');
var index = require('..'); var index = require('..');
var log = index.log; var log = index.log;
@ -64,7 +65,7 @@ describe('P2P Functionality', function() {
bitcoind = require('../').services.Bitcoin({ bitcoind = require('../').services.Bitcoin({
spawn: { spawn: {
datadir: datadir, datadir: datadir,
exec: 'bitcoind' exec: path.resolve(__dirname, '../bin/bitcoind')
}, },
node: { node: {
network: bitcore.Networks.testnet network: bitcore.Networks.testnet

6
lib/transaction.js
View File

@ -1,10 +1,12 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var levelup = require('levelup');
var bitcore = require('bitcore-lib'); var bitcore = require('bitcore-lib');
var Transaction = bitcore.Transaction; var Transaction = bitcore.Transaction;
var index = require('./');
var errors = index.errors;
var MAX_TRANSACTION_LIMIT = 5; var MAX_TRANSACTION_LIMIT = 5;
Transaction.prototype.populateInputs = function(db, poolTransactions, callback) { Transaction.prototype.populateInputs = function(db, poolTransactions, callback) {
@ -30,7 +32,7 @@ Transaction.prototype._populateInput = function(db, input, poolTransactions, cal
} }
var txid = input.prevTxId.toString('hex'); var txid = input.prevTxId.toString('hex');
db.getTransaction(txid, true, function(err, prevTx) { db.getTransaction(txid, true, function(err, prevTx) {
if(err instanceof levelup.errors.NotFoundError) { if(err instanceof errors.Transaction.NotFoundError) {
// Check the pool for transaction // Check the pool for transaction
for(var i = 0; i < poolTransactions.length; i++) { for(var i = 0; i < poolTransactions.length; i++) {
if(txid === poolTransactions[i].hash) { if(txid === poolTransactions[i].hash) {

3
package.json
View File

@ -40,7 +40,7 @@
], ],
"dependencies": { "dependencies": {
"async": "^1.3.0", "async": "^1.3.0",
"bitcoind-rpc": "^0.3.0", "bitcoind-rpc": "braydonf/bitcoind-rpc#8d27a545f4e7de5a8faca5de6bdbb1a6c1e41f5c",
"bitcore-lib": "^0.13.13", "bitcore-lib": "^0.13.13",
"body-parser": "^1.13.3", "body-parser": "^1.13.3",
"colors": "^1.1.2", "colors": "^1.1.2",
@ -58,6 +58,7 @@
}, },
"devDependencies": { "devDependencies": {
"benchmark": "1.0.0", "benchmark": "1.0.0",
"bitcore-p2p": "^1.1.0",
"chai": "^3.0.0", "chai": "^3.0.0",
"mocha": "~1.16.2", "mocha": "~1.16.2",
"proxyquire": "^1.3.1", "proxyquire": "^1.3.1",

2
scripts/install
View File

@ -44,7 +44,7 @@ if test $? -eq 0; then
echo "Unpacking bitcoin distribution" echo "Unpacking bitcoin distribution"
tar -xvzf $tarball_name tar -xvzf $tarball_name
if test $? -eq 0; then if test $? -eq 0; then
ln -s "bitcoin-${version}/bin/bitcoind" ln -sf "bitcoin-${version}/bin/bitcoind"
exit 0 exit 0
fi fi
fi fi