From 26173b8ee6563c8b8337ebd6efe383a1301df8c5 Mon Sep 17 00:00:00 2001 From: Brian Botha Date: Thu, 26 May 2022 16:14:53 +1000 Subject: [PATCH] syntax: general clean up --- tests/network/Proxy.test.ts | 56 +++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/tests/network/Proxy.test.ts b/tests/network/Proxy.test.ts index 230703b305..d3315f6f8d 100644 --- a/tests/network/Proxy.test.ts +++ b/tests/network/Proxy.test.ts @@ -11,7 +11,7 @@ import * as networkUtils from '@/network/utils'; import * as networkErrors from '@/network/errors'; import * as keysUtils from '@/keys/utils'; import * as nodesUtils from '@/nodes/utils'; -import { promisify, promise, timerStart, timerStop, poll } from '@/utils'; +import { poll, promise, promisify, timerStart, timerStop } from '@/utils'; import * as testUtils from '../utils'; /** @@ -141,6 +141,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -157,6 +159,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -170,6 +174,7 @@ describe(Proxy.name, () => { // Start it again await proxy.start({ forwardHost: '::1' as Host, + proxyHost: localHost, serverHost: localHost, serverPort: port, tlsConfig: { @@ -193,6 +198,7 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, serverHost: localHost, serverPort: port, }); @@ -244,6 +250,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -278,6 +286,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -336,6 +346,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -395,6 +407,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -501,6 +515,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -619,6 +635,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -738,6 +756,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -863,6 +883,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -993,6 +1015,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1142,6 +1166,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1294,6 +1320,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1465,6 +1493,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1621,6 +1651,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1753,6 +1785,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -1871,6 +1905,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -2009,6 +2045,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -2116,6 +2154,8 @@ describe(Proxy.name, () => { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, }, + proxyHost: localHost, + forwardHost: localHost, serverHost: localHost, serverPort: port, }); @@ -2267,7 +2307,8 @@ describe(Proxy.name, () => { await proxy.start({ serverHost: serverHost(), serverPort: serverPort(), - + proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, @@ -2298,7 +2339,8 @@ describe(Proxy.name, () => { await proxy.start({ serverHost: serverHost(), serverPort: serverPort(), - + proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem, @@ -2338,6 +2380,8 @@ describe(Proxy.name, () => { await proxy.start({ serverHost: serverHost(), serverPort: serverPort(), + proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, @@ -2389,6 +2433,8 @@ describe(Proxy.name, () => { await proxy.start({ serverHost: serverHost(), serverPort: serverPort(), + proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, @@ -2465,6 +2511,8 @@ describe(Proxy.name, () => { await proxy.start({ serverHost: serverHost(), serverPort: serverPort(), + proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, @@ -2624,6 +2672,7 @@ describe(Proxy.name, () => { certChainPem: certPem, }, proxyHost: localHost, + forwardHost: localHost, }); const externalHost = proxy.getProxyHost(); const externalPort = proxy.getProxyPort(); @@ -2730,6 +2779,7 @@ describe(Proxy.name, () => { serverHost: serverHost(), serverPort: serverPort(), proxyHost: localHost, + forwardHost: localHost, tlsConfig: { keyPrivatePem: keyPairPem.privateKey, certChainPem: certPem,