Skip to content
Permalink
Browse files

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: #27081
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information...
Trott committed Apr 4, 2019
1 parent 14df42f commit bc2d258a3ee8266a6e54cb023b98d6993e72bab1
Showing with 3 additions and 3 deletions.
  1. +3 −3 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])
};
}

0 comments on commit bc2d258

Please sign in to comment.
You can’t perform that action at this time.