Remove randomStringWithBytes

dingosky · dingosky · commit b2b9d61b9955 · 2017-07-19T20:54:11.000-07:00
Use arg type for function override
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -52,8 +52,9 @@ const bitsWithPowers = (tPower, rPower) => {
   return N
 }
 
-const randomString = (entropy, charSet, crypto = true) => {
-  const bytes = crypto ? _cryptoBytes(entropy, charSet) : _randomBytes(entropy, charSet)
+const randomString = (entropy, charSet, opt) => {
+  let bytes = (opt instanceof Array) ? opt :
+      (opt === false) ? _randomBytes(entropy, charSet) : _cryptoBytes(entropy, charSet)
   return randomStringWithBytes(entropy, charSet, bytes)
 }
 
diff --git a/test/entropy.js b/test/entropy.js
@@ -453,8 +453,9 @@ test('Custom 64 chars', t => {
   let charSet = entropy.charSet64
   try {
     charSet.use('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ9876543210_-')
-    let string = entropy.randomStringWithBytes(72, charSet,
-                                               [0x9d, 0x99, 0x4e, 0xa5, 0xd2, 0x3f, 0x8c, 0x86, 0x80])
+    let bytes = [0x9d, 0x99, 0x4e, 0xa5, 0xd2, 0x3f, 0x8c, 0x86, 0x80]
+    let string = entropy.randomString(72, charSet, bytes)
+                                               
     t.is(string, 'NzLoPDi-JiAa')
   }
   catch(error) {
@@ -470,8 +471,7 @@ test('Custom 32 chars', t => {
   let charSet = entropy.charSet32
   try {
     charSet.use('2346789BDFGHJMNPQRTbdfghjlmnpqrt')
-    let string = entropy.randomStringWithBytes(55, charSet,
-                                               [0xd2, 0xe3, 0xe9, 0xda, 0x19, 0x97, 0x52])
+    let string = entropy.randomString(55, charSet, [0xd2, 0xe3, 0xe9, 0xda, 0x19, 0x97, 0x52])
     t.is(string, 'mHRrbgQlTqF')
   }
   catch(error) {
@@ -487,7 +487,7 @@ test('Custom 16 chars', t => {
   let charSet = entropy.charSet16
   try {
     charSet.use('0123456789ABCDEF')
-    let string = entropy.randomStringWithBytes(20, charSet, [0xc7, 0xc9, 0x00])
+    let string = entropy.randomString(20, charSet, [0xc7, 0xc9, 0x00])
     t.is(string, 'C7C90')
   }
   catch(error) {
@@ -503,7 +503,7 @@ test('Custom 8 chars', t => {
   let charSet = entropy.charSet8
   try {
     charSet.use('abcdefgh')
-    let string = entropy.randomStringWithBytes(30, charSet, [0xc7, 0xc9, 0x07, 0xc9])
+    let string = entropy.randomString(30, charSet, [0xc7, 0xc9, 0x07, 0xc9])
     t.is(string, 'gbheeeahgc')
   }
   catch(error) {
@@ -519,7 +519,7 @@ test('Custom 4 chars', t => {
   let charSet = entropy.charSet4
   try {
     charSet.use('atcg')
-    let string = entropy.randomStringWithBytes(16, charSet, [0x20, 0xf1])
+    let string = entropy.randomString(16, charSet, [0x20, 0xf1])
     t.is(string, 'acaaggat')
   }
   catch(error) {
@@ -535,7 +535,7 @@ test('Custom 2 chars', t => {
   let charSet = entropy.charSet2
   try {
     charSet.use('HT')
-    let string = entropy.randomStringWithBytes(16, charSet, [0xe3, 0xe9])
+    let string = entropy.randomString(16, charSet, [0xe3, 0xe9])
     t.is(string, 'TTTHHHTTTTTHTHHT')
   }
   catch(error) {

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,9 @@ const bitsWithPowers = (tPower, rPower) => {`
`52`	`52`	`return N`
`53`	`53`	`}`
`54`	`54`
`55`		`-const randomString = (entropy, charSet, crypto = true) => {`
`56`		`- const bytes = crypto ? _cryptoBytes(entropy, charSet) : _randomBytes(entropy, charSet)`
	`55`	`+const randomString = (entropy, charSet, opt) => {`
	`56`	`+ let bytes = (opt instanceof Array) ? opt :`
	`57`	`+ (opt === false) ? _randomBytes(entropy, charSet) : _cryptoBytes(entropy, charSet)`
`57`	`58`	`return randomStringWithBytes(entropy, charSet, bytes)`
`58`	`59`	`}`
`59`	`60`