lib: refactor to use validateNumber

Lxxyx · targos · commit a29da64b46fe · 2021-02-02T10:41:55.000+01:00
PR-URL: #36993 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Pooja D P <Pooja.D.P@ibm.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -102,6 +102,7 @@ const {
 const {
 validateArray,
 validateBuffer,
+ validateNumber,
 validateInteger,
 validateString
 } = require('internal/validators');
@@ -346,9 +347,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,10 +7,8 @@ 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 { validateNumber } = require('internal/validators');
 
 const kDestroy = Symbol('kDestroy');
 const kHandle = Symbol('kHandle');
@@ -58,8 +56,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');
@@ -981,8 +982,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') {

-Original file line number
+Diff line change
 const{
  validateArray,
  validateBuffer,
 + validateNumber,
  validateInteger,
  validateString
 }=require('internal/validators');
 // occurs. This is done simply to keep the internal details of the
 // implementation from bleeding out to users.
 constassertSize=hideStackFrames((size)=>{
 -if(typeofsize!=='number'){
 -thrownewERR_INVALID_ARG_TYPE('size','number',size);
 -}
 +validateNumber(size,'size');
 if(!(size>=0&&size<=kMaxLength)){
 thrownewERR_INVALID_ARG_VALUE.RangeError('size',size);
+}
-Original file line number
+Diff line change
 const{
  validateArray,
 + validateNumber,
  validateString
 }=require('internal/validators');
 functionsetEngine(id,flags){
 validateString(id,'id');
 -if(flags&&typeofflags!=='number')
 -thrownewERR_INVALID_ARG_TYPE('flags','number',flags);
 +if(flags)
 +validateNumber(flags,'flags');
 flags=flags>>>0;
 // Use provided engine for everything by default
 functionvalidateBitLength(length,name,required=false){
 if(length!==undefined||required){
 -if(typeoflength!=='number')
 -thrownewERR_INVALID_ARG_TYPE(name,'number',length);
 +validateNumber(length,name);
 if(length<0)
 thrownewERR_OUT_OF_RANGE(name,'> 0');
 if(length%8){
-Original file line number
+Diff line change
 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{ validateNumber }=require('internal/validators');
 constkDestroy=Symbol('kDestroy');
 constkHandle=Symbol('kHandle');
+}
 percentile(percentile){
 -if(typeofpercentile!=='number')
 -thrownewERR_INVALID_ARG_TYPE('percentile','number',percentile);
 +validateNumber(percentile,'percentile');
 if(NumberIsNaN(percentile)||percentile<=0||percentile>100)
 thrownewERR_INVALID_ARG_VALUE.RangeError('percentile',percentile);