From 75540b61169a7975944d8b5bc0e12dcbf50f838d Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Wed, 22 Apr 2015 10:17:14 +1000 Subject: [PATCH 1/4] bufferutils: remove equal, use Buffer.compare --- src/bufferutils.js | 11 ----------- src/transaction_builder.js | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/bufferutils.js b/src/bufferutils.js index 773e502..9f1c85e 100644 --- a/src/bufferutils.js +++ b/src/bufferutils.js @@ -168,16 +168,6 @@ function varIntBuffer (i) { return buffer } -function equal (a, b) { - if (a.length !== b.length) return false - - for (var i = 0; i < a.length; ++i) { - if (a[i] !== b[i]) return false - } - - return true -} - function reverse (buffer) { var buffer2 = new Buffer(buffer) Array.prototype.reverse.call(buffer2) @@ -185,7 +175,6 @@ function reverse (buffer) { } module.exports = { - equal: equal, pushDataSize: pushDataSize, readPushDataInt: readPushDataInt, readUInt64LE: readUInt64LE, diff --git a/src/transaction_builder.js b/src/transaction_builder.js index a08af72..763cd1c 100644 --- a/src/transaction_builder.js +++ b/src/transaction_builder.js @@ -400,7 +400,7 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash // enforce in order signing of public keys assert(input.pubKeys.some(function (pubKey, i) { - if (!bufferutils.equal(kpPubKey, pubKey)) return false + if (kpPubKey.compare(pubKey) !== 0) return false assert(!input.signatures[i], 'Signature already exists') @@ -408,7 +408,7 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash input.signatures[i] = signature return true - }, this), 'key pair cannot sign for this input') + }), 'key pair cannot sign for this input') } module.exports = TransactionBuilder From 706666024ebfa0dfaa06484215bc0c260d2aa247 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Wed, 22 Apr 2015 17:44:21 +1000 Subject: [PATCH 2/4] travis: node 0.12 only --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26f05da..7422a8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ language: node_js before_install: - "npm install npm -g" node_js: - - "0.11" - - "0.10" + - "0.12" env: - TEST_SUITE=coveralls - TEST_SUITE=integration From 11bba2a8e7e5ba4cdf4e00ac3449d50e69f8aaf6 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 27 Apr 2015 12:03:35 +1000 Subject: [PATCH 3/4] tests: remove bufferutils.equal tests --- test/bufferutils.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/test/bufferutils.js b/test/bufferutils.js index c97e0bc..eaef22a 100644 --- a/test/bufferutils.js +++ b/test/bufferutils.js @@ -88,22 +88,6 @@ describe('bufferutils', function () { }) }) - describe('equal', function () { - fixtures.valid.forEach(function (f) { - describe('for ' + f.hexVI, function () { - fixtures.valid.forEach(function (f2) { - it('equates the string comparison: ' + f.hexVI + ' === ' + f2.hexVI, function () { - var a = new Buffer(f.hexVI, 'hex') - var b = new Buffer(f2.hexVI, 'hex') - var expected = f.hexVI === f2.hexVI - - assert.equal(bufferutils.equal(a, b), expected) - }) - }) - }) - }) - }) - describe('reverse', function () { fixtures.valid.forEach(function (f) { it('reverses ' + f.hex64 + ' correctly', function () { From f9b99fc0df5d36b11f9f4f5d7bf68baebc0e0477 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Mon, 27 Apr 2015 12:04:38 +1000 Subject: [PATCH 4/4] txbuilder: remove unused bufferutils import --- src/transaction_builder.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/transaction_builder.js b/src/transaction_builder.js index 763cd1c..cafcfc8 100644 --- a/src/transaction_builder.js +++ b/src/transaction_builder.js @@ -1,5 +1,4 @@ var assert = require('assert') -var bufferutils = require('./bufferutils') var ops = require('./opcodes') var scripts = require('./scripts')