From ee4ef8ebaf986ad0bab34899f2716572eac9c256 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Fri, 6 Feb 2015 16:41:05 -0300
Subject: [PATCH] all tests passing!

---
 integration/bitcoind.js | 3 ++-
 lib/messages.js         | 4 ++--
 test/data/messages.json | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/integration/bitcoind.js b/integration/bitcoind.js
index 279141c..45ddd53 100644
--- a/integration/bitcoind.js
+++ b/integration/bitcoind.js
@@ -47,7 +47,6 @@ describe('Integration with ' + network.name + ' bitcoind', function() {
       Math.abs(new Date() - m.timestamp).should.be.below(10000); // less than 10 seconds of time difference
       m.nonce.length.should.equal(8);
       m.start_height.should.be.above(300000);
-      console.log(peer.host);
       cb();
     });
     peer.once('verack', function(m) {
@@ -164,6 +163,8 @@ describe('Integration with ' + network.name + ' bitcoind', function() {
       peer.once('headers', function(message) {
         (message instanceof Messages.Headers).should.equal(true);
         message.headers.length.should.equal(3);
+        //console.log(message.serialize(network).toString('hex'));
+        //console.log(message.getPayload().toString('hex'));
         cb();
       });
       var message = new Messages.GetHeaders(from, stop);
diff --git a/lib/messages.js b/lib/messages.js
index fdfff97..d970f24 100644
--- a/lib/messages.js
+++ b/lib/messages.js
@@ -653,13 +653,12 @@ Headers.prototype.fromBuffer = function(payload) {
   $.checkArgument(payload && payload.length > 0, 'No data found to create Headers message');
   var parser = new BufferReader(payload);
   var count = parser.readVarintNum();
-  console.log(count);
 
   this.headers = [];
   for (var i = 0; i < count; i++) {
     var header = BlockHeaderModel.fromBufferReader(parser);
     this.headers.push(header);
-    var txn_count = parser.readUInt8(); // this value is always 0
+    var txn_count = parser.readUInt8();
     $.checkState(txn_count === 0, 'txn_count should always be 0');
 
   }
@@ -676,6 +675,7 @@ Headers.prototype.getPayload = function() {
       .headers[i]
       .toBuffer();
     put.put(buffer);
+    put.varint(0);
   }
 
   return put.buffer();
diff --git a/test/data/messages.json b/test/data/messages.json
index ada41e7..21728f0 100644
--- a/test/data/messages.json
+++ b/test/data/messages.json
@@ -32,8 +32,8 @@
     "payload": ""
   },
   "HEADERS": {
-    "message": "f9beb4d9686561646572730000000000a1000000ffd6770b0202000000b91ddbbfc801b7fe6f470ce9528f98f01b496b53f23c411300000000000000004901c9d18d0a468b20cc62ddf75aee58cf410440ea390300bf7a5f6848be350508d4cb54c0a31a18b9f661ec0002000000a02d6472e3e6fc9a1cebeaad14a90208a715e2bd234ea00600000000000000006f596f650fbbd5478489c66d651c9e3ea56f394d1f1481f90975cf0c8dda45fd3ad4cb54c0a31a1872e262",
-    "payload": "0202000000b91ddbbfc801b7fe6f470ce9528f98f01b496b53f23c411300000000000000004901c9d18d0a468b20cc62ddf75aee58cf410440ea390300bf7a5f6848be350508d4cb54c0a31a18b9f661ec0002000000a02d6472e3e6fc9a1cebeaad14a90208a715e2bd234ea00600000000000000006f596f650fbbd5478489c66d651c9e3ea56f394d1f1481f90975cf0c8dda45fd3ad4cb54c0a31a1872e262"
+    "message": "f9beb4d9686561646572730000000000f400000043385d010302000000b91ddbbfc801b7fe6f470ce9528f98f01b496b53f23c411300000000000000004901c9d18d0a468b20cc62ddf75aee58cf410440ea390300bf7a5f6848be350508d4cb54c0a31a18b9f661ec0002000000a02d6472e3e6fc9a1cebeaad14a90208a715e2bd234ea00600000000000000006f596f650fbbd5478489c66d651c9e3ea56f394d1f1481f90975cf0c8dda45fd3ad4cb54c0a31a1872e262a200020000002e4db38f1970099bf21335edd604e7a591213e189d1d1806000000000000000031a30091f5bdbca8958d2c4ccc0bfa9df93e2a3ea4d00e03222a663179db90a756d6cb54c0a31a187947855000",
+    "payload": "0302000000b91ddbbfc801b7fe6f470ce9528f98f01b496b53f23c411300000000000000004901c9d18d0a468b20cc62ddf75aee58cf410440ea390300bf7a5f6848be350508d4cb54c0a31a18b9f661ec0002000000a02d6472e3e6fc9a1cebeaad14a90208a715e2bd234ea00600000000000000006f596f650fbbd5478489c66d651c9e3ea56f394d1f1481f90975cf0c8dda45fd3ad4cb54c0a31a1872e262a200020000002e4db38f1970099bf21335edd604e7a591213e189d1d1806000000000000000031a30091f5bdbca8958d2c4ccc0bfa9df93e2a3ea4d00e03222a663179db90a756d6cb54c0a31a187947855000"
   },
   "TX": {
     "message": "",