lib: refactor to use validateNumber

nodejs · Jan 19, 2021 · 98480ae · 98480ae
1 parent fef2128
commit 98480ae
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -101,6 +101,7 @@ const {
 } = require('internal/errors');
 const {
   validateBuffer,
+  validateNumber,
   validateInteger,
   validateString
 } = require('internal/validators');
@@ -345,9 +346,7 @@ ObjectSetPrototypeOf(Buffer, Uint8Array);
 // occurs. This is done simply to keep the internal details of the
 // implementation from bleeding out to users.
 const assertSize = hideStackFrames((size) => {
-  if (typeof size !== 'number') {
-    throw new ERR_INVALID_ARG_TYPE('size', 'number', size);
-  }
+  validateNumber(size, 'size');
   if (!(size >= 0 && size <= kMaxLength)) {
     throw new ERR_INVALID_ARG_VALUE.RangeError('size', size);
   }

diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -42,6 +42,7 @@ const {
 
 const {
   validateArray,
+  validateNumber,
   validateString
 } = require('internal/validators');
 
@@ -104,8 +105,8 @@ const getCurves = cachedResult(() => filterDuplicateStrings(_getCurves()));
 
 function setEngine(id, flags) {
   validateString(id, 'id');
-  if (flags && typeof flags !== 'number')
-    throw new ERR_INVALID_ARG_TYPE('flags', 'number', flags);
+  if (flags) {
+    validateNumber(flags, 'flags');
   flags = flags >>> 0;
 
   // Use provided engine for everything by default
@@ -244,8 +245,7 @@ function hasAnyNotIn(set, ...check) {
 
 function validateBitLength(length, name, required = false) {
   if (length !== undefined || required) {
-    if (typeof length !== 'number')
-      throw new ERR_INVALID_ARG_TYPE(name, 'number', length);
+    validateNumber(length, name);
     if (length < 0)
       throw new ERR_OUT_OF_RANGE(name, '> 0');
     if (length % 8) {

diff --git a/lib/internal/histogram.js b/lib/internal/histogram.js
@@ -7,14 +7,13 @@ const {
 const { format } = require('util');
 const { NumberIsNaN, SafeMap, Symbol } = primordials;
 
-const {
-  ERR_INVALID_ARG_TYPE,
-  ERR_INVALID_ARG_VALUE,
-} = require('internal/errors').codes;
+const { ERR_INVALID_ARG_VALUE } = require('internal/errors').codes;
 
 const kDestroy = Symbol('kDestroy');
 const kHandle = Symbol('kHandle');
 
+const { validateNumber } = require('internal/validators');
+
 // Histograms are created internally by Node.js and used to
 // record various metrics. This Histogram class provides a
 // generally read-only view of the internal histogram.
@@ -58,8 +57,7 @@ class Histogram {
   }
 
   percentile(percentile) {
-    if (typeof percentile !== 'number')
-      throw new ERR_INVALID_ARG_TYPE('percentile', 'number', percentile);
+    validateNumber(percentile, 'percentile');
 
     if (NumberIsNaN(percentile) || percentile <= 0 || percentile > 100)
       throw new ERR_INVALID_ARG_VALUE.RangeError('percentile', percentile);

diff --git a/lib/net.js b/lib/net.js
@@ -111,6 +111,7 @@ const { isUint8Array } = require('internal/util/types');
 const {
   validateAbortSignal,
   validateInt32,
+  validateNumber,
   validatePort,
   validateString
 } = require('internal/validators');
@@ -987,8 +988,8 @@ function lookupAndConnect(self, options) {
     throw new ERR_INVALID_IP_ADDRESS(localAddress);
   }
 
-  if (localPort && typeof localPort !== 'number') {
-    throw new ERR_INVALID_ARG_TYPE('options.localPort', 'number', localPort);
+  if (localPort) {
+    validateNumber(localPort, 'options.localPort');
   }
 
   if (typeof port !== 'undefined') {