Merge pull request #654 from webmaster128/rng-cleanups

Syntax and documentation improvements in passphrase utility - closes #663

src/utils/passphrase.js

@@ -44,8 +44,8 @@ const init = (rand = Math.random()) => {
 
 /**
  * - From a zero byte:
- * - Removes all the 1s and replaces all the 1s with their index
- * - Creates a random number with the length of resulting array (pos)
+ * - Removes all the 1s and replaces all the 0s with their index
+ * - Creates a random index (pos) of the resulting array
  * - sets the bit in the pos position
  * - creates random byte using crypto and assigns that to seed in the
  *    position of pos
@@ -59,10 +59,10 @@ const init = (rand = Math.random()) => {
  * @returns {number[]} The input array whose member is pos is set
  */
 export const generateSeed = ({ byte, seed, percentage, step } = init(), rand = Math.random()) => {
-  const available = byte.map((bit, index) => (!bit ? index : null)).filter(bit => (bit !== null));
+  const available = byte.map((bit, idx) => (!bit ? idx : null)).filter(idx => (idx !== null));
   const seedIndex = (available.length > 0) ?
-    available[parseInt(rand * available.length, 10)] :
-    parseInt(rand * byte.length, 10);
+    available[Math.floor(rand * available.length)] :
+    Math.floor(rand * byte.length);
 
   const content = leftPadd(crypto.randomBytes(1)[0].toString(16), '0', 2);
 

src/utils/passphrase.test.js

@@ -105,8 +105,9 @@ describe('Passphrase', () => {
 
     it('should generate an array of 16 hex numbers as seed', () => {
       const { seed } = generateSeed();
+      expect(seed.length).to.be.equal(16);
       seed.forEach((num) => {
-        expect(parseInt(`0x${num}`, 10)).to.be.below(256);
+        expect(parseInt(num, 16)).to.be.below(256);
       });
     });
   });