test: simplify loadDHParam in TLS test

tniessen · MylesBorins · commit eaa30e494761 · 2018-02-27T00:47:34.000-05:00
PR-URL: #18103 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/test/parallel/test-tls-client-getephemeralkeyinfo.js b/test/parallel/test-tls-client-getephemeralkeyinfo.js
@@ -6,7 +6,6 @@ const fixtures = require('../common/fixtures');
 
 const assert = require('assert');
 const tls = require('tls');
-const fs = require('fs');
 
 const key = fixtures.readKey('agent2-key.pem');
 const cert = fixtures.readKey('agent2-cert.pem');
@@ -15,9 +14,7 @@ let ntests = 0;
 let nsuccess = 0;
 
 function loadDHParam(n) {
- let path = fixtures.fixturesDir;
- if (n !== 'error') path += '/keys';
- return fs.readFileSync(`${path}/dh${n}.pem`);
+ return fixtures.readKey(`dh${n}.pem`);
 }
 
 const cipherlist = {
diff --git a/test/parallel/test-tls-client-mindhsize.js b/test/parallel/test-tls-client-mindhsize.js
@@ -14,10 +14,7 @@ let nsuccess = 0;
 let nerror = 0;
 
 function loadDHParam(n) {
- const params = [`dh${n}.pem`];
- if (n !== 'error')
- params.unshift('keys');
- return fixtures.readSync(params);
+ return fixtures.readKey(`dh${n}.pem`);
 }
 
 function test(size, err, next) {

-Original file line number
+Diff line change
 constassert=require('assert');
 consttls=require('tls');
 -constfs=require('fs');
 constkey=fixtures.readKey('agent2-key.pem');
 constcert=fixtures.readKey('agent2-cert.pem');
 letnsuccess=0;
 functionloadDHParam(n){
 -letpath=fixtures.fixturesDir;
 -if(n!=='error')path+='/keys';
 -returnfs.readFileSync(`${path}/dh${n}.pem`);
 +returnfixtures.readKey(`dh${n}.pem`);
+}
 constcipherlist={