From fb7accbd5e2a8d1efb5c9aec444212fba41299d5 Mon Sep 17 00:00:00 2001
From: Huw McNamara <huwmcnamara@msn.com>
Date: Wed, 7 Feb 2018 19:31:40 +0000
Subject: [PATCH] don't use pick. fixed tests

---
 types/node/index.d.ts                  | 28 +++++++++++---------------
 types/smtp-server/smtp-server-tests.ts |  5 +++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 1792eccdac..50e1792253 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1744,23 +1744,19 @@ declare module "https" {
     export type ServerOptions = tls.SecureContextOptions & tls.TlsServerOptions;
 
     // see https://nodejs.org/dist/latest/docs/api/https.html#https_https_request_options_callback
-    type extendedRequestKeys = "ca" |
-        "cert" |
-        "ciphers" |
-        "clientCertEngine" |
-        "key" |
-        "passphrase" |
-        "pfx" |
-        "rejectUnauthorized" |
-        "secureProtocol" |
-        "servername";
 
-    // as many type definitions rely on node, redefine Pick here instead of updating all of them to typescript 2.1
-    type PortedPick<T, K extends keyof T> = {
-        [P in K]: T[P];
-    };
-
-    export type RequestOptions = http.RequestOptions & PortedPick<tls.ConnectionOptions, extendedRequestKeys>;
+    export type RequestOptions = http.RequestOptions & {
+        ca?: tls.ConnectionOptions["ca"];
+        cert?: tls.ConnectionOptions["cert"];
+        ciphers?: tls.ConnectionOptions["ciphers"];
+        clientCertEngine?: tls.ConnectionOptions["clientCertEngine"];
+        key?: tls.ConnectionOptions["key"];
+        passphrase?: tls.ConnectionOptions["passphrase"];
+        pfx?: tls.ConnectionOptions["pfx"];
+        rejectUnauthorized?: tls.ConnectionOptions["rejectUnauthorized"];
+        secureProtocol?: tls.ConnectionOptions["secureProtocol"];
+        servername?: tls.ConnectionOptions["servername"];
+    }
 
     export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
         rejectUnauthorized?: boolean;
diff --git a/types/smtp-server/smtp-server-tests.ts b/types/smtp-server/smtp-server-tests.ts
index 29c05c942e..5be0634ebb 100644
--- a/types/smtp-server/smtp-server-tests.ts
+++ b/types/smtp-server/smtp-server-tests.ts
@@ -8,9 +8,10 @@ const options: SMTPServerOptions = {
     onRcptTo,
     onData,
     onClose,
-    port: 2525
 };
 
+const port = 2525;
+
 function onConnect(session: SMTPServerSession, callback: (err?: Error) => void): void {
     console.log(`[${session.id}] onConnect`);
     callback();
@@ -69,7 +70,7 @@ server.on('close', () => {
     console.log('Server closed');
 });
 
-server.listen(options.port, () => {
+server.listen(port, () => {
     const address = server.server.address();
     console.log(`Listening on [${address.address}]:${address.port}`);
 });