From cdf53d1fc5f5bcaffe2329101de156bc77aedb73 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 18 Feb 2014 12:19:04 -0300 Subject: [PATCH] migrating to buffertools best practices --- Transaction.js | 3 ++- util/util.js | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Transaction.js b/Transaction.js index 36bbbeb..154015e 100644 --- a/Transaction.js +++ b/Transaction.js @@ -11,12 +11,13 @@ function spec(b) { var Put = b.Put || require('bufferput'); var Parser = b.Parser || require('./util/BinaryParser').class(); var Step = b.Step || require('step'); + var buffertools = require('buffertools'); var error = b.error || require('./util/error'); var VerificationError = error.VerificationError; var MissingSourceError = error.MissingSourceError; - var COINBASE_OP = util.NULL_HASH.concat(new Buffer("FFFFFFFF", 'hex')); + var COINBASE_OP = buffertools.concat(util.NULL_HASH, new Buffer("FFFFFFFF", 'hex')); function TransactionIn(data) { if ("object" !== typeof data) { diff --git a/util/util.js b/util/util.js index 9ae61cb..e67ae83 100644 --- a/util/util.js +++ b/util/util.js @@ -3,7 +3,7 @@ var crypto = require('crypto'); var bignum = require('bignum'); var Binary = require('binary'); var Put = require('bufferput'); -require('buffertools').extend(); +var buffertools = require('buffertools'); var sha256 = exports.sha256 = function (data) { return new Buffer(crypto.createHash('sha256').update(data).digest('binary'), 'binary'); @@ -321,13 +321,15 @@ var varIntBuf = exports.varIntBuf = function varIntBuf(n) { }; var varStrBuf = exports.varStrBuf = function varStrBuf(s) { - return Buffer.concat(varIntBuf(s.length), s); + return buffertools.concat(varIntBuf(s.length), s); }; // Initializations -exports.NULL_HASH = new Buffer(32).fill(0); +exports.NULL_HASH = new Buffer(32) +buffertools.fill(exports.NULL_HASH, 0); exports.EMPTY_BUFFER = new Buffer(0); -exports.ZERO_VALUE = new Buffer(8).fill(0); +exports.ZERO_VALUE = new Buffer(8) +buffertools.fill(exports.ZERO_VALUE, 0); var INT64_MAX = new Buffer('ffffffffffffffff', 'hex'); exports.INT64_MAX = INT64_MAX;