From 4aaf295cd5f9db1b3adb483316cbb4c85defe254 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Tue, 29 May 2018 11:37:03 +1000 Subject: [PATCH] fix standard 11 issues --- src/script.js | 2 +- src/script_number.js | 10 +++++----- test/ecpair.js | 2 +- test/integration/bip32.js | 2 +- test/integration/blocks.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/script.js b/src/script.js index 0277061..2860d66 100644 --- a/src/script.js +++ b/src/script.js @@ -187,7 +187,7 @@ function isCanonicalPubKey (buffer) { function isDefinedHashType (hashType) { var hashTypeMod = hashType & ~0x80 -// return hashTypeMod > SIGHASH_ALL && hashTypeMod < SIGHASH_SINGLE + // return hashTypeMod > SIGHASH_ALL && hashTypeMod < SIGHASH_SINGLE return hashTypeMod > 0x00 && hashTypeMod < 0x04 } diff --git a/src/script_number.js b/src/script_number.js index 44f4bec..3fd6326 100644 --- a/src/script_number.js +++ b/src/script_number.js @@ -35,11 +35,11 @@ function decode (buffer, maxLength, minimal) { function scriptNumSize (i) { return i > 0x7fffffff ? 5 - : i > 0x7fffff ? 4 - : i > 0x7fff ? 3 - : i > 0x7f ? 2 - : i > 0x00 ? 1 - : 0 + : i > 0x7fffff ? 4 + : i > 0x7fff ? 3 + : i > 0x7f ? 2 + : i > 0x00 ? 1 + : 0 } function encode (number) { diff --git a/test/ecpair.js b/test/ecpair.js index 6b617da..046808f 100644 --- a/test/ecpair.js +++ b/test/ecpair.js @@ -255,7 +255,7 @@ describe('ECPair', function () { it('wraps ecdsa.verify', hoodwink(function () { this.mock(ecdsa, 'verify', function (h, s, q) { assert.strictEqual(h, hash) -// assert.strictEqual(s, signature) + // assert.strictEqual(s, signature) assert.deepEqual(s, { r: BigInteger.fromBuffer(signature.slice(0, 32)), s: BigInteger.fromBuffer(signature.slice(32, 64)) diff --git a/test/integration/bip32.js b/test/integration/bip32.js index b7f0bb2..6695a96 100644 --- a/test/integration/bip32.js +++ b/test/integration/bip32.js @@ -88,7 +88,7 @@ describe('bitcoinjs-lib (BIP32)', function () { }) it('can use BIP39 to generate BIP32 addresses', function () { -// var mnemonic = bip39.generateMnemonic() + // var mnemonic = bip39.generateMnemonic() var mnemonic = 'praise you muffin lion enable neck grocery crumble super myself license ghost' assert(bip39.validateMnemonic(mnemonic)) diff --git a/test/integration/blocks.js b/test/integration/blocks.js index 58faab2..56eca68 100644 --- a/test/integration/blocks.js +++ b/test/integration/blocks.js @@ -12,7 +12,7 @@ describe('bitcoinjs-lib (blocks)', function () { assert.strictEqual(tx.ins.length, 1) let script = tx.ins[0].script -// bitcoin.script.decompile(script) // returns [] :( + // bitcoin.script.decompile(script) // returns [] :( assert.strictEqual(script[0], 0x03) let heightBuffer = script.slice(1, 4)