From bc2d258a3ee8266a6e54cb023b98d6993e72bab1 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 3 Apr 2019 17:07:15 -0700 Subject: [PATCH] dns: refactor internal/dns/promises.js Use `isIP()` instead of `isIPv4()` since it does the additional functionality that we were adding after our calls to `isIP()`. This not-so-incidentally also increases code coverage from tests. At least one of the replaced ternaries was difficult to cover reliably because operating system/configuration variances were too unpredictable. PR-URL: https://github.com/nodejs/node/pull/27081 Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- lib/internal/dns/promises.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/internal/dns/promises.js b/lib/internal/dns/promises.js index cd4607f4857927..2969721355adaa 100644 --- a/lib/internal/dns/promises.js +++ b/lib/internal/dns/promises.js @@ -10,7 +10,7 @@ const { } = require('internal/dns/utils'); const { codes, dnsException } = require('internal/errors'); const { toASCII } = require('internal/idna'); -const { isIP, isIPv4, isLegalPort } = require('internal/net'); +const { isIP, isLegalPort } = require('internal/net'); const { getaddrinfo, getnameinfo, @@ -34,7 +34,7 @@ function onlookup(err, addresses) { return; } - const family = this.family ? this.family : isIPv4(addresses[0]) ? 4 : 6; + const family = this.family ? this.family : isIP(addresses[0]); this.resolve({ address: addresses[0], family }); } @@ -51,7 +51,7 @@ function onlookupall(err, addresses) { addresses[i] = { address, - family: family ? family : isIPv4(addresses[i]) ? 4 : 6 + family: family ? family : isIP(addresses[i]) }; }