trying to fix travis error
This commit is contained in:
parent
9d4d06dc6c
commit
5a63b58737
78
lib/node.js
78
lib/node.js
@ -26,7 +26,6 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService
|
|||||||
$.checkArgument(blockService, 'blockService is required');
|
$.checkArgument(blockService, 'blockService is required');
|
||||||
$.checkArgument(transactionService, 'transactionService is required');
|
$.checkArgument(transactionService, 'transactionService is required');
|
||||||
$.checkArgument(addressService, 'addressService is required');
|
$.checkArgument(addressService, 'addressService is required');
|
||||||
var self = this;
|
|
||||||
this.bus = bus;
|
this.bus = bus;
|
||||||
this.networkMonitor = networkMonitor;
|
this.networkMonitor = networkMonitor;
|
||||||
|
|
||||||
@ -38,18 +37,43 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService
|
|||||||
|
|
||||||
this.blockCache = {};
|
this.blockCache = {};
|
||||||
this.inventory = {}; // blockHash -> bool (has data)
|
this.inventory = {}; // blockHash -> bool (has data)
|
||||||
|
this.initialize();
|
||||||
|
};
|
||||||
|
util.inherits(BitcoreNode, EventEmitter);
|
||||||
|
|
||||||
/*
|
BitcoreNode.create = function(opts) {
|
||||||
this.networkMonitor.on('inv', function(inventory) {
|
opts = opts || {};
|
||||||
_.each(inventory, function(info) {
|
|
||||||
var hash = bitcore.util.buffer.reverse(info.hash).toString('hex');
|
var bus = new EventBus();
|
||||||
$.checkState(_.isUndefined(self.inventory[hash]), hash);
|
|
||||||
if (self.inventory[hash] && info.type === 2) { // TODO: use static field from bitcore-p2p
|
var networkMonitor = NetworkMonitor.create(bus, opts.NetworkMonitor);
|
||||||
self.inventory[hash] = false;
|
|
||||||
}
|
var database = opts.database || Promise.promisifyAll(
|
||||||
});
|
new LevelUp(opts.LevelUp || './db')
|
||||||
|
);
|
||||||
|
var rpc = opts.rpc || Promise.promisifyAll(new RPC(opts.RPC));
|
||||||
|
|
||||||
|
var transactionService = opts.transactionService || new TransactionService({
|
||||||
|
rpc: rpc,
|
||||||
|
database: database
|
||||||
});
|
});
|
||||||
*/
|
var blockService = opts.blockService || new BlockService({
|
||||||
|
rpc: rpc,
|
||||||
|
database: database,
|
||||||
|
transactionService: transactionService
|
||||||
|
});
|
||||||
|
var addressService = opts.addressService || new AddressService({
|
||||||
|
rpc: rpc,
|
||||||
|
database: database,
|
||||||
|
transactionService: transactionService,
|
||||||
|
blockService: blockService
|
||||||
|
});
|
||||||
|
return new BitcoreNode(bus, networkMonitor, blockService, transactionService, addressService);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
BitcoreNode.prototype.initialize = function() {
|
||||||
|
var self = this;
|
||||||
|
|
||||||
setInterval(function() {
|
setInterval(function() {
|
||||||
if (!self.blockchain) {
|
if (!self.blockchain) {
|
||||||
@ -112,38 +136,6 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService
|
|||||||
this.networkMonitor.on('disconnect', function() {
|
this.networkMonitor.on('disconnect', function() {
|
||||||
console.log('network monitor disconnected');
|
console.log('network monitor disconnected');
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
|
||||||
util.inherits(BitcoreNode, EventEmitter);
|
|
||||||
|
|
||||||
BitcoreNode.create = function(opts) {
|
|
||||||
opts = opts || {};
|
|
||||||
|
|
||||||
var bus = new EventBus();
|
|
||||||
|
|
||||||
var networkMonitor = NetworkMonitor.create(bus, opts.NetworkMonitor);
|
|
||||||
|
|
||||||
var database = Promise.promisifyAll(
|
|
||||||
new LevelUp(opts.LevelUp || './db')
|
|
||||||
);
|
|
||||||
var rpc = Promise.promisifyAll(new RPC(opts.RPC));
|
|
||||||
|
|
||||||
var transactionService = new TransactionService({
|
|
||||||
rpc: rpc,
|
|
||||||
database: database
|
|
||||||
});
|
|
||||||
var blockService = new BlockService({
|
|
||||||
rpc: rpc,
|
|
||||||
database: database,
|
|
||||||
transactionService: transactionService
|
|
||||||
});
|
|
||||||
var addressService = new AddressService({
|
|
||||||
rpc: rpc,
|
|
||||||
database: database,
|
|
||||||
transactionService: transactionService,
|
|
||||||
blockService: blockService
|
|
||||||
});
|
|
||||||
return new BitcoreNode(bus, networkMonitor, blockService, transactionService, addressService);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
BitcoreNode.prototype.start = function() {
|
BitcoreNode.prototype.start = function() {
|
||||||
|
|||||||
24
test/node.js
24
test/node.js
@ -34,25 +34,13 @@ describe('BitcoreNode', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('from create', function() {
|
it('from create', function() {
|
||||||
|
var dbMock = {};
|
||||||
|
var rpcMock = {};
|
||||||
var opts = {
|
var opts = {
|
||||||
LevelUp: './db-test',
|
database: dbMock,
|
||||||
network: 'testnet',
|
rpc: rpcMock,
|
||||||
NetworkMonitor: {
|
blockService: bsMock,
|
||||||
host: 'localhost',
|
transactionService: tsMock
|
||||||
port: 8555,
|
|
||||||
},
|
|
||||||
Reporter: 'none',
|
|
||||||
BitcoreHTTP: {
|
|
||||||
host: 'somehost',
|
|
||||||
port: 9090,
|
|
||||||
},
|
|
||||||
RPC: {
|
|
||||||
user: 'test-user',
|
|
||||||
pass: 'test-password',
|
|
||||||
protocol: 'http',
|
|
||||||
host: '8.8.8.8',
|
|
||||||
port: 8552,
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
var node = BitcoreNode.create(opts);
|
var node = BitcoreNode.create(opts);
|
||||||
should.exist(node);
|
should.exist(node);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user