From fc4fc9ea5c3589d41aa8a0d7001aa9c528b1e9f4 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 22 Feb 2016 15:35:17 -0800 Subject: [PATCH] improve toHex. --- lib/bcoin/utils.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/bcoin/utils.js b/lib/bcoin/utils.js index a42c60e2..afcab5af 100644 --- a/lib/bcoin/utils.js +++ b/lib/bcoin/utils.js @@ -14,7 +14,7 @@ var util = require('util'); * Utils */ -function toArray(msg, enc) { +utils.toArray = function toArray(msg, enc) { if (Buffer.isBuffer(msg)) return Array.prototype.slice.call(msg); @@ -62,8 +62,7 @@ function toArray(msg, enc) { } return res; -} -utils.toArray = toArray; +}; var base58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZ' + 'abcdefghijkmnopqrstuvwxyz'; @@ -347,15 +346,10 @@ utils.stringify = function stringify(arr) { return res; }; -function zero2(word) { - if (word.length === 1) - return '0' + word; - return word; -} - -function toHex(msg) { +utils.toHex = function toHex(msg) { var res = ''; var i = 0; + var word; if (Buffer.isBuffer(msg)) return msg.toString('hex'); @@ -363,13 +357,17 @@ function toHex(msg) { if (typeof msg === 'string') return msg; - for (; i < msg.length; i++) - res += zero2(msg[i].toString(16)); + res = new Buffer(msg).toString('hex'); + + // for (; i < msg.length; i++) { + // word = msg[i].toString(16); + // if (word.length === 1) + // word = '0' + word; + // res += word; + // } return res; -} - -utils.toHex = toHex; +}; utils.isHex = function isHex(msg) { return typeof msg === 'string' && /^[0-9a-f]+$/i.test(msg);