From 177cf9ac250948caa90cc1e0babd84a1908b68e5 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Fri, 10 Apr 2015 12:47:15 -0300 Subject: [PATCH] fix more tests --- .gitignore | 2 +- lib/node.js | 6 ++---- test/node.js | 22 +++++++++++++++++++++- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 83b58634..a477a2de 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ report *~ .idea .project -peerdb.json npm-debug.log .nodemonignore @@ -39,6 +38,7 @@ db/blocks db/testnet/blocks/* db/testnet/blocks db/* +db-test/ README.html public diff --git a/lib/node.js b/lib/node.js index eee7c8ac..ab855519 100644 --- a/lib/node.js +++ b/lib/node.js @@ -5,7 +5,6 @@ var EventEmitter = require('eventemitter2').EventEmitter2; var bitcore = require('bitcore'); var _ = bitcore.deps._; -var config = require('config'); var $ = bitcore.util.preconditions; var Promise = require('bluebird'); var RPC = require('bitcoind-rpc'); @@ -68,7 +67,6 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService if (block.height % 100 === 0) { console.log('block', block.id, 'height', block.height); - console.log('cache size', Object.keys(self.blockCache).length); } return Promise.each(blockchainChanges.unconfirmed, function(hash) { @@ -119,9 +117,9 @@ BitcoreNode.create = function(opts) { var networkMonitor = NetworkMonitor.create(bus, opts.NetworkMonitor); var database = Promise.promisifyAll( - new LevelUp(opts.LevelUp || config.get('LevelUp')) + new LevelUp(opts.LevelUp) ); - var rpc = Promise.promisifyAll(new RPC(config.get('RPC'))); + var rpc = Promise.promisifyAll(new RPC(opts.RPC)); var transactionService = new TransactionService({ rpc: rpc, diff --git a/test/node.js b/test/node.js index 63c7301a..929e8a99 100644 --- a/test/node.js +++ b/test/node.js @@ -34,7 +34,27 @@ describe('BitcoreNode', function() { }); it('from create', function() { - var node = BitcoreNode.create(); + var opts = { + LevelUp: './db-test', + network: 'testnet', + NetworkMonitor: { + host: 'localhost', + 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); should.exist(node); }); });