From db17accf9897dc69a6b8a58d83d3736b241c945f Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 9 Apr 2015 18:19:55 -0300
Subject: [PATCH] fix some more tests

---
 lib/node.js  | 18 ++++++++++--------
 test/node.js | 14 ++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/node.js b/lib/node.js
index fafd0fb2..248317cf 100644
--- a/lib/node.js
+++ b/lib/node.js
@@ -22,8 +22,11 @@ var BlockChain = require('./blockchain');
 var genesisBlocks = require('./data/genesis');
 
 var BitcoreNode = function(bus, networkMonitor, blockService, transactionService, addressService) {
-  $.checkArgument(bus);
-  $.checkArgument(networkMonitor);
+  $.checkArgument(bus, 'bus is required');
+  $.checkArgument(networkMonitor, 'networkMonitor is required');
+  $.checkArgument(blockService, 'blockService is required');
+  $.checkArgument(transactionService, 'transactionService is required');
+  $.checkArgument(addressService, 'addressService is required');
   var self = this;
   this.bus = bus;
   this.networkMonitor = networkMonitor;
@@ -97,12 +100,6 @@ var BitcoreNode = function(bus, networkMonitor, blockService, transactionService
 };
 util.inherits(BitcoreNode, EventEmitter);
 
-BitcoreNode.prototype.requestFromTip = function() {
-  var locator = this.blockchain.getBlockLocator();
-  console.log('requesting blocks, locator size:', locator.length);
-  this.networkMonitor.requestBlocks(locator);
-};
-
 BitcoreNode.create = function(opts) {
   opts = opts || {};
 
@@ -153,6 +150,11 @@ BitcoreNode.prototype.stop = function(reason) {
   this.networkMonitor.stop(reason);
 };
 
+BitcoreNode.prototype.requestFromTip = function() {
+  var locator = this.blockchain.getBlockLocator();
+  console.log('requesting blocks, locator size:', locator.length);
+  this.networkMonitor.requestBlocks(locator);
+};
 
 BitcoreNode.prototype.sync = function() {
   var self = this;
diff --git a/test/node.js b/test/node.js
index fe9ca6e8..dc4a525b 100644
--- a/test/node.js
+++ b/test/node.js
@@ -13,16 +13,20 @@ Promise.longStackTraces();
 describe('BitcoreNode', function() {
 
   // mocks
-  var busMock, nmMock;
+  var node, busMock, nmMock, bsMock, tsMock, asMock;
   beforeEach(function() {
     busMock = new EventBus();
     nmMock = new EventEmitter();
     nmMock.start = function() {};
+    bsMock = {};
+    tsMock = {};
+    asMock = {};
+    node = new BitcoreNode(busMock, nmMock, bsMock, tsMock, asMock);
   });
   describe('instantiates', function() {
     it('from constructor', function() {
-      var node = new BitcoreNode(busMock, nmMock);
-      should.exist(node);
+      var n = new BitcoreNode(busMock, nmMock, bsMock, tsMock, asMock);
+      should.exist(n);
     });
 
     it('from create', function() {
@@ -32,17 +36,15 @@ describe('BitcoreNode', function() {
   });
 
   it('starts', function() {
-    var node = new BitcoreNode(busMock, nmMock);
+    node.start();
     node.start.bind(node).should.not.throw();
   });
 
   it('broadcasts errors from network monitor', function(cb) {
-    var node = new BitcoreNode(busMock, nmMock);
     node.on('error', cb);
     nmMock.emit('error');
   });
   it('exposes all events from the event bus', function(cb) {
-    var node = new BitcoreNode(busMock, nmMock);
     node.on('foo', cb);
     busMock.emit('foo');
   });