Merge pull request bitcoinjs#397 from bitcoinjs/buftools

bufferutils: remove equal, use Buffer.compare

Author: dcousens

.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

src/bufferutils.js

@@ -168,24 +168,13 @@ 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)
   return buffer2
 }
 
 module.exports = {
-  equal: equal,
   pushDataSize: pushDataSize,
   readPushDataInt: readPushDataInt,
   readUInt64LE: readUInt64LE,

src/transaction_builder.js

@@ -1,5 +1,4 @@
 var assert = require('assert')
-var bufferutils = require('./bufferutils')
 var ops = require('./opcodes')
 var scripts = require('./scripts')
 
@@ -400,15 +399,15 @@ 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')
 
     var signature = keyPair.sign(signatureHash)
     input.signatures[i] = signature
 
     return true
-  }, this), 'key pair cannot sign for this input')
+  }), 'key pair cannot sign for this input')
 }
 
 module.exports = TransactionBuilder

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 () {