From c3ead97d641513bf9557d302c7266ac7efdfb3aa Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Apr 2015 16:24:17 -0300 Subject: [PATCH] fix integration tests for testnet --- integration/bitcoind.js | 9 +++++---- lib/peer.js | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/integration/bitcoind.js b/integration/bitcoind.js index 8d07056..9343fde 100644 --- a/integration/bitcoind.js +++ b/integration/bitcoind.js @@ -17,12 +17,14 @@ var Pool = p2p.Pool; var Networks = bitcore.Networks; var Messages = p2p.Messages; var Inventory = p2p.Inventory; -var messages = new Messages(); var Block = bitcore.Block; var Transaction = bitcore.Transaction; // config -var network = process.env.NETWORK === 'testnet'? Networks.testnet: Networks.livenet; +var network = process.env.NETWORK === 'testnet' ? Networks.testnet : Networks.livenet; +var messages = new Messages({ + network: network +}); var blockHash = { 'livenet': '000000000000000013413cf2536b491bf0988f52e90c476ffeb701c8bfdb1db9', 'testnet': '0000000058cc069d964711cd25083c0a709f4df2b34c8ff9302ce71fe5b45786' @@ -175,11 +177,10 @@ describe('Integration with ' + network.name + ' bitcoind', function() { peer.sendMessage(message); }); }); - it.only('gets blocks', function(cb) { + it('gets blocks', function(cb) { connect(function(peer) { peer.once('inv', function(message) { message.command.should.equal('inv'); - console.log('LLEGO UN INV', message.inventory.length); if (message.inventory.length === 2) { message.inventory[0].type.should.equal(Inventory.TYPE.BLOCK); message.inventory[1].type.should.equal(Inventory.TYPE.BLOCK); diff --git a/lib/peer.js b/lib/peer.js index 13f4bd3..25a4eaa 100644 --- a/lib/peer.js +++ b/lib/peer.js @@ -191,7 +191,6 @@ Peer.prototype.disconnect = function() { * @param {Message} message - A message instance */ Peer.prototype.sendMessage = function(message) { - console.log('>sending', message.command); this.socket.write(message.toBuffer()); }; @@ -219,7 +218,6 @@ Peer.prototype._sendPong = function(nonce) { Peer.prototype._readMessage = function() { var message = this.messages.parseBuffer(this.dataBuffer); if (message) { - console.log('