Refactor

dingosky · dingosky · commit 7afc9ae50053 · 2017-08-10T09:45:18.000-07:00
entropy -&gt; entropyBits
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -53,21 +53,21 @@ const bitsWithPowers = (tPower, rPower) => {
   return N
 }
 
-const string = (entropy, charSet) => {
-  return stringWithBytes(entropy, charSet, _cryptoBytes(entropy, charSet))
+const string = (entropyBits, charSet) => {
+  return stringWithBytes(entropyBits, charSet, _cryptoBytes(entropyBits, charSet))
 }
 
-const stringRandom = (entropy, charSet) => {
-  return stringWithBytes(entropy, charSet, _randomBytes(entropy, charSet))
+const stringRandom = (entropyBits, charSet) => {
+  return stringWithBytes(entropyBits, charSet, _randomBytes(entropyBits, charSet))
 }
 
-const stringWithBytes = (entropy, charSet, bytes) => {
+const stringWithBytes = (entropyBits, charSet, bytes) => {
   if (!CharSet.isValid(charSet)) {
     throw new Error('Invalid CharSet')
   }
-  if (entropy <= 0) { return '' }
+  if (entropyBits <= 0) { return '' }
 
-  const count = Math.ceil(entropy / charSet.bitsPerChar)
+  const count = Math.ceil(entropyBits / charSet.bitsPerChar)
   if (count <= 0) { return '' }
 
   const needed = Math.ceil(count * (charSet.bitsPerChar / _bitsPerByte))
@@ -92,22 +92,22 @@ const stringWithBytes = (entropy, charSet, bytes) => {
   return string
 }
 
-const bytesNeeded = (entropy, charSet) => {
+const bytesNeeded = (entropyBits, charSet) => {
   if (!CharSet.isValid(charSet)) { throw new Error('Invalid CharSet') }
-  const count = Math.ceil(entropy / charSet.bitsPerChar)
+  const count = Math.ceil(entropyBits / charSet.bitsPerChar)
   if (count <= 0) { return 0 }
 
   const bytesPerSlice = charSet.bitsPerChar / _bitsPerByte
   return Math.ceil(count * bytesPerSlice)
 }
 
-const _cryptoBytes = (entropy, charSet) => {
+const _cryptoBytes = (entropyBits, charSet) => {
   const crypto = require('crypto')
-  return Buffer.from(crypto.randomBytes(bytesNeeded(entropy, charSet)))
+  return Buffer.from(crypto.randomBytes(bytesNeeded(entropyBits, charSet)))
 }
 
-const _randomBytes = (entropy, charSet) => {
-  const byteCount = bytesNeeded(entropy, charSet)
+const _randomBytes = (entropyBits, charSet) => {
+  const byteCount = bytesNeeded(entropyBits, charSet)
   const randCount = Math.ceil(byteCount / 6)
 
   const buffer = new Buffer(byteCount)
