Refactor

dingosky · dingosky · commit 214d84bb7de1 · 2017-08-09T22:52:47.000-07:00
Inline function called once
diff --git a/dist/lib/charSet.js b/dist/lib/charSet.js
@@ -108,23 +108,14 @@ var _ndxDiv = function _ndxDiv(chunk, slice, bytes, entropyPerChar) {
   return (bytes[chunk] << lShift * slice & 0xff) >> rShift;
 };
 
-var charSet64 = new CharSet("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_", _ndx64);
-var charSet32 = new CharSet("2346789bdfghjmnpqrtBDFGHJLMNPQRT", _ndx32);
-var charSet16 = new CharSet("0123456789abcdef", _ndx16);
-var charSet8 = new CharSet("01234567", _ndx8);
-var charSet4 = new CharSet("ATCG", _ndx4);
-var charSet2 = new CharSet("01", _ndx2);
-
-var isValid = function isValid(charSet) {
-  return charSet instanceof CharSet;
-};
-
 exports.default = {
-  charSet64: charSet64,
-  charSet32: charSet32,
-  charSet16: charSet16,
-  charSet8: charSet8,
-  charSet4: charSet4,
-  charSet2: charSet2,
-  isValid: isValid
+  charSet64: new CharSet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_', _ndx64),
+  charSet32: new CharSet('2346789bdfghjmnpqrtBDFGHJLMNPQRT', _ndx32),
+  charSet16: new CharSet('0123456789abcdef', _ndx16),
+  charSet8: new CharSet('01234567', _ndx8),
+  charSet4: new CharSet('ATCG', _ndx4),
+  charSet2: new CharSet('01', _ndx2),
+  isValid: function isValid(charSet) {
+    return charSet instanceof CharSet;
+  }
 };
diff --git a/dist/lib/entropy.js b/dist/lib/entropy.js
@@ -147,18 +147,14 @@ var _randomBytes = function _randomBytes(entropy, charSet) {
     for (var n = 0; n < 6; n++) {
       var fByteNum = _endianByteNum[n];
       var bByteNum = 6 * rNum + n;
-      _bufferByte(buffer, bByteNum, fByteNum, byteCount, dataView);
+      if (bByteNum < byteCount) {
+        buffer[bByteNum] = dataView.getUint8(fByteNum);
+      }
     }
   }
   return buffer;
 };
 
-var _bufferByte = function _bufferByte(buffer, bByte, nByte, byteCount, dataView) {
-  if (bByte < byteCount) {
-    buffer[bByte] = dataView.getUint8(nByte);
-  }
-};
-
 exports.default = {
   bits: bits,
   bitsWithRiskPower: bitsWithRiskPower,
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -117,18 +117,14 @@ const _randomBytes = (entropy, charSet) => {
     for (let n = 0; n < 6; n++) {
       let fByteNum = _endianByteNum[n]
       let bByteNum = 6*rNum + n
-      _bufferByte(buffer, bByteNum, fByteNum, byteCount, dataView)
+      if (bByteNum < byteCount) {
+        buffer[bByteNum] = dataView.getUint8(fByteNum)
+      }
     }
   }
   return buffer
 }
 
-const _bufferByte = (buffer, bByte, nByte, byteCount, dataView) => {
-  if (bByte < byteCount) {
-    buffer[bByte] = dataView.getUint8(nByte)
-  }
-}
-
 export default {
   bits,
   bitsWithRiskPower,
