convenience: varint -> vi

lib/block.js

@@ -4,15 +4,15 @@ var BufferWriter = require('./bufferwriter');
 var Blockheader = require('./blockheader');
 var Varint = require('./varint');
 
-var Block = function Block(magicnum, blocksize, blockheader, txsvarint, txs) {
+var Block = function Block(magicnum, blocksize, blockheader, txsvi, txs) {
   if (!(this instanceof Block))
-    return new Block(magicnum, blocksize, blockheader, txsvarint, txs);
+    return new Block(magicnum, blocksize, blockheader, txsvi, txs);
   if (typeof magicnum === 'number') {
     this.set({
       magicnum: magicnum,
       blocksize: blocksize,
       blockheader: blockheader,
-      txsvarint: txsvarint,
+      txsvi: txsvi,
       txs: txs
     });
   } else if (magicnum) {
@@ -24,7 +24,7 @@ Block.prototype.set = function(obj) {
   this.magicnum = typeof obj.magicnum !== 'undefined' ? obj.magicnum : this.magicnum;
   this.blocksize = typeof obj.blocksize !== 'undefined' ? obj.blocksize : this.blocksize;
   this.blockheader = obj.blockheader || this.blockheader;
-  this.txsvarint = obj.txsvarint || this.txsvarint;
+  this.txsvi = obj.txsvi || this.txsvi;
   this.txs = obj.txs || this.txs;
   return this;
 };
@@ -37,8 +37,8 @@ Block.prototype.fromBufferReader = function(br) {
   this.magicnum = br.readUInt32LE();
   this.blocksize = br.readUInt32LE();
   this.blockheader = Blockheader().fromBufferReader(br);
-  this.txsvarint = Varint(br.readVarintBuf());
+  this.txsvi = Varint(br.readVarintBuf());
-  var txslen = this.txsvarint.toNumber();
+  var txslen = this.txsvi.toNumber();
   this.txs = [];
   for (var i = 0; i < txslen; i++) {
     this.txs.push(Transaction().fromBufferReader(br));
@@ -56,8 +56,8 @@ Block.prototype.toBufferWriter = function(bw) {
   bw.writeUInt32LE(this.magicnum);
   bw.writeUInt32LE(this.blocksize);
   bw.write(this.blockheader.toBuffer());
-  bw.write(this.txsvarint.buf);
+  bw.write(this.txsvi.buf);
-  var txslen = this.txsvarint.toNumber();
+  var txslen = this.txsvi.toNumber();
   for (var i = 0; i < txslen; i++) {
     this.txs[i].toBufferWriter(bw);
   }

test/block.js

@@ -24,13 +24,13 @@ describe('Block', function() {
   bhhex = '0100000005050505050505050505050505050505050505050505050505050505050505050909090909090909090909090909090909090909090909090909090909090909020000000300000004000000';
   bhbuf = new Buffer(bhhex, 'hex');
   var bh = Blockheader().fromBuffer(bhbuf);
-  var txsvarint = Varint(1);
+  var txsvi = Varint(1);
   var txs = [Transaction().fromBuffer(txbuf)];
   var block = Block().set({
     magicnum: magicnum,
     blocksize: blocksize,
     blockheader: bh,
-    txsvarint: txsvarint,
+    txsvi: txsvi,
     txs: txs
   });
   var blockhex = 'f9beb4d93200000001000000050505050505050505050505050505050505050505050505050505050505050509090909090909090909090909090909090909090909090909090909090909090200000003000000040000000101000000029e8d016a7b0dc49a325922d05da1f916d1e4d4f0cb840c9727f3d22ce8d1363f000000008c493046022100e9318720bee5425378b4763b0427158b1051eec8b08442ce3fbfbf7b30202a44022100d4172239ebd701dae2fbaaccd9f038e7ca166707333427e3fb2a2865b19a7f27014104510c67f46d2cbb29476d1f0b794be4cb549ea59ab9cc1e731969a7bf5be95f7ad5e7f904e5ccf50a9dc1714df00fbeb794aa27aaff33260c1032d931a75c56f2ffffffffa3195e7a1ab665473ff717814f6881485dc8759bebe97e31c301ffe7933a656f020000008b48304502201c282f35f3e02a1f32d2089265ad4b561f07ea3c288169dedcf2f785e6065efa022100e8db18aadacb382eed13ee04708f00ba0a9c40e3b21cf91da8859d0f7d99e0c50141042b409e1ebbb43875be5edde9c452c82c01e3903d38fa4fd89f3887a52cb8aea9dc8aec7e2c9d5b3609c03eb16259a2537135a1bf0f9c5fbbcbdbaf83ba402442ffffffff02206b1000000000001976a91420bb5c3bfaef0231dc05190e7f1c8e22e098991e88acf0ca0100000000001976a9149e3e2d23973a04ec1b02be97c30ab9f2f27c3b2c88ac00000000';
@@ -43,13 +43,13 @@ describe('Block', function() {
         magicnum: magicnum,
         blocksize: blocksize,
         blockheader: bh,
-        txsvarint: txsvarint,
+        txsvi: txsvi,
         txs: txs
       });
       should.exist(block.magicnum);
       should.exist(block.blocksize);
       should.exist(block.blockheader);
-      should.exist(block.txsvarint);
+      should.exist(block.txsvi);
       should.exist(block.txs);
     });