From d49ca406ffe959834f466aea4ea2f404589bc5ca Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Fri, 3 Oct 2014 18:04:24 +1000 Subject: [PATCH 1/3] bs58: avoid assert dependency --- lib/bs58.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bs58.js b/lib/bs58.js index 7501ed5..743de0e 100644 --- a/lib/bs58.js +++ b/lib/bs58.js @@ -5,8 +5,6 @@ // Merged Buffer refactorings from base58-native by Stephen Pair // Copyright (c) 2013 BitPay Inc -var assert = require('assert') - var ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' var ALPHABET_MAP = {} for(var i = 0; i < ALPHABET.length; i++) { @@ -50,7 +48,7 @@ function decode(string) { var i, j, bytes = [0] for (i = 0; i < string.length; i++) { var c = string[i] - assert(c in ALPHABET_MAP, 'Non-base58 character') + if (!(c in ALPHABET_MAP)) throw new Error('Non-base58 character') for (j = 0; j < bytes.length; j++) bytes[j] *= BASE bytes[0] += ALPHABET_MAP[c] From 4fa6987e86e1e41961def78c43f177eb1c027053 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Fri, 3 Oct 2014 18:12:45 +1000 Subject: [PATCH 2/3] bs58: remove Buffer dependency --- lib/bs58.js | 4 ++-- test/bs58.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bs58.js b/lib/bs58.js index 743de0e..b523a25 100644 --- a/lib/bs58.js +++ b/lib/bs58.js @@ -43,7 +43,7 @@ function encode(buffer) { } function decode(string) { - if (string.length === 0) return new Buffer(0) + if (string.length === 0) return [] var i, j, bytes = [0] for (i = 0; i < string.length; i++) { @@ -71,7 +71,7 @@ function decode(string) { // deal with leading zeros for (i = 0; string[i] === '1' && i < string.length - 1; i++) bytes.push(0) - return new Buffer(bytes.reverse()) + return bytes.reverse() } module.exports = { diff --git a/test/bs58.js b/test/bs58.js index 9b55a7e..0db5578 100644 --- a/test/bs58.js +++ b/test/bs58.js @@ -17,7 +17,7 @@ describe('base58', function() { describe('decode', function() { fixtures.valid.forEach(function(f) { it('can decode ' + f.string, function() { - var actual = base58.decode(f.string).toString('hex') + var actual = new Buffer(base58.decode(f.string)).toString('hex') assert.strictEqual(actual, f.hex) }) From 6966e4f11ac1cdfc03646c1efdda256bf8613000 Mon Sep 17 00:00:00 2001 From: Daniel Cousens Date: Fri, 3 Oct 2014 18:23:52 +1000 Subject: [PATCH 3/3] package: update dev-dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 143e292..9a6150b 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "litecoin" ], "devDependencies": { - "coveralls": "^2.10.0", + "coveralls": "^2.11.2", "istanbul": "^0.2.10", "jshint": "2.5.1", - "mocha": "^1.19.0", + "mocha": "^1.21.4", "mocha-lcov-reporter": "0.0.1", "mochify": "~0.4.2" },