From 2f077ddd29b04e5ab08b67bbda1761d80e28c78b Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 1 Dec 2019 12:13:33 -0800
Subject: [PATCH] test: use block-scoping in test-net-server-address

Use block-scoping in test-net-server-address. This also allows us to
easily rename some identifiers that were not camelCase.

PR-URL: https://github.com/nodejs/node/pull/30754
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 test/sequential/test-net-server-address.js | 122 +++++++++++----------
 1 file changed, 67 insertions(+), 55 deletions(-)

diff --git a/test/sequential/test-net-server-address.js b/test/sequential/test-net-server-address.js
index 52a8c1ac820e24..4312ffd5a1fe78 100644
--- a/test/sequential/test-net-server-address.js
+++ b/test/sequential/test-net-server-address.js
@@ -25,77 +25,89 @@ const assert = require('assert');
 const net = require('net');
 
 // Test on IPv4 Server
-const family_ipv4 = 'IPv4';
-const server_ipv4 = net.createServer();
-
-server_ipv4.on('error', common.mustNotCall());
-
-server_ipv4
-  .listen(common.PORT + 1, common.localhostIPv4, common.mustCall(() => {
-    const address_ipv4 = server_ipv4.address();
-    assert.strictEqual(address_ipv4.address, common.localhostIPv4);
-    assert.strictEqual(address_ipv4.port, common.PORT + 1);
-    assert.strictEqual(address_ipv4.family, family_ipv4);
-    server_ipv4.close();
-  }));
+{
+  const family = 'IPv4';
+  const server = net.createServer();
+
+  server.on('error', common.mustNotCall());
+
+  server
+    .listen(common.PORT + 1, common.localhostIPv4, common.mustCall(() => {
+      const address4 = server.address();
+      assert.strictEqual(address4.address, common.localhostIPv4);
+      assert.strictEqual(address4.port, common.PORT + 1);
+      assert.strictEqual(address4.family, family);
+      server.close();
+    }));
+}
 
 if (!common.hasIPv6) {
   common.printSkipMessage('ipv6 part of test, no IPv6 support');
   return;
 }
 
+const family6 = 'IPv6';
+const anycast6 = '::';
+
 // Test on IPv6 Server
-const localhost_ipv6 = '::1';
-const family_ipv6 = 'IPv6';
-const server_ipv6 = net.createServer();
+{
+  const localhost = '::1';
 
-server_ipv6.on('error', common.mustNotCall());
+  const server = net.createServer();
 
-server_ipv6.listen(common.PORT + 2, localhost_ipv6, common.mustCall(() => {
-  const address_ipv6 = server_ipv6.address();
-  assert.strictEqual(address_ipv6.address, localhost_ipv6);
-  assert.strictEqual(address_ipv6.port, common.PORT + 2);
-  assert.strictEqual(address_ipv6.family, family_ipv6);
-  server_ipv6.close();
-}));
+  server.on('error', common.mustNotCall());
 
-// Test without hostname or ip
-const anycast_ipv6 = '::';
-const server1 = net.createServer();
-
-server1.on('error', common.mustNotCall());
+  server.listen(common.PORT + 2, localhost, common.mustCall(() => {
+    const address = server.address();
+    assert.strictEqual(address.address, localhost);
+    assert.strictEqual(address.port, common.PORT + 2);
+    assert.strictEqual(address.family, family6);
+    server.close();
+  }));
+}
 
-// Specify the port number
-server1.listen(common.PORT + 3, common.mustCall(() => {
-  const address = server1.address();
-  assert.strictEqual(address.address, anycast_ipv6);
-  assert.strictEqual(address.port, common.PORT + 3);
-  assert.strictEqual(address.family, family_ipv6);
-  server1.close();
-}));
+// Test without hostname or ip
+{
+  const server = net.createServer();
+
+  server.on('error', common.mustNotCall());
+
+  // Specify the port number
+  server.listen(common.PORT + 3, common.mustCall(() => {
+    const address = server.address();
+    assert.strictEqual(address.address, anycast6);
+    assert.strictEqual(address.port, common.PORT + 3);
+    assert.strictEqual(address.family, family6);
+    server.close();
+  }));
+}
 
 // Test without hostname or port
-const server2 = net.createServer();
+{
+  const server = net.createServer();
 
-server2.on('error', common.mustNotCall());
+  server.on('error', common.mustNotCall());
 
-// Don't specify the port number
-server2.listen(common.mustCall(() => {
-  const address = server2.address();
-  assert.strictEqual(address.address, anycast_ipv6);
-  assert.strictEqual(address.family, family_ipv6);
-  server2.close();
-}));
+  // Don't specify the port number
+  server.listen(common.mustCall(() => {
+    const address = server.address();
+    assert.strictEqual(address.address, anycast6);
+    assert.strictEqual(address.family, family6);
+    server.close();
+  }));
+}
 
 // Test without hostname, but with a false-y port
-const server3 = net.createServer();
+{
+  const server = net.createServer();
 
-server3.on('error', common.mustNotCall());
+  server.on('error', common.mustNotCall());
 
-// Specify a false-y port number
-server3.listen(0, common.mustCall(() => {
-  const address = server3.address();
-  assert.strictEqual(address.address, anycast_ipv6);
-  assert.strictEqual(address.family, family_ipv6);
-  server3.close();
-}));
+  // Specify a false-y port number
+  server.listen(0, common.mustCall(() => {
+    const address = server.address();
+    assert.strictEqual(address.address, anycast6);
+    assert.strictEqual(address.family, family6);
+    server.close();
+  }));
+}