crypto: improve invalid arg type message for randomInt()

Trott · addaleax · commit 2b7273b2ad53 · 2020-09-22T23:48:13.000+02:00
Use "must be a safe integer" rather than "must be safe integer". I believe the former is more easily understood/clear. PR-URL: #35089 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -144,10 +144,10 @@ function randomInt(min, max, callback) {
     throw new ERR_INVALID_CALLBACK(callback);
   }
   if (!NumberIsSafeInteger(min)) {
-    throw new ERR_INVALID_ARG_TYPE('min', 'safe integer', min);
+    throw new ERR_INVALID_ARG_TYPE('min', 'a safe integer', min);
   }
   if (!NumberIsSafeInteger(max)) {
-    throw new ERR_INVALID_ARG_TYPE('max', 'safe integer', max);
+    throw new ERR_INVALID_ARG_TYPE('max', 'a safe integer', max);
   }
   if (max <= min) {
     throw new ERR_OUT_OF_RANGE(
diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
@@ -394,13 +394,13 @@ assert.throws(
     const invalidMinError = {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: 'The "min" argument must be safe integer.' +
+      message: 'The "min" argument must be a safe integer.' +
                `${common.invalidArgTypeHelper(i)}`,
     };
     const invalidMaxError = {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: 'The "max" argument must be safe integer.' +
+      message: 'The "max" argument must be a safe integer.' +
                `${common.invalidArgTypeHelper(i)}`,
     };
 
@@ -441,7 +441,7 @@ assert.throws(
     {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: 'The "min" argument must be safe integer.' +
+      message: 'The "min" argument must be a safe integer.' +
       `${common.invalidArgTypeHelper(minInt - 1)}`,
     }
   );
@@ -451,7 +451,7 @@ assert.throws(
     {
       code: 'ERR_INVALID_ARG_TYPE',
       name: 'TypeError',
-      message: 'The "max" argument must be safe integer.' +
+      message: 'The "max" argument must be a safe integer.' +
       `${common.invalidArgTypeHelper(maxInt + 1)}`,
     }
   );

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,10 @@ function randomInt(min, max, callback) {`
`144`	`144`	`throw new ERR_INVALID_CALLBACK(callback);`
`145`	`145`	`}`
`146`	`146`	`if (!NumberIsSafeInteger(min)) {`
`147`		`- throw new ERR_INVALID_ARG_TYPE('min', 'safe integer', min);`
	`147`	`+ throw new ERR_INVALID_ARG_TYPE('min', 'a safe integer', min);`
`148`	`148`	`}`
`149`	`149`	`if (!NumberIsSafeInteger(max)) {`
`150`		`- throw new ERR_INVALID_ARG_TYPE('max', 'safe integer', max);`
	`150`	`+ throw new ERR_INVALID_ARG_TYPE('max', 'a safe integer', max);`
`151`	`151`	`}`
`152`	`152`	`if (max <= min) {`
`153`	`153`	`throw new ERR_OUT_OF_RANGE(`