From b09e18c654e04d53ed91da1e8ef374610ebe4b16 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 1 Feb 2018 14:00:01 -0800
Subject: [PATCH] ed2curve: Use package.json for tweetnacl dependency (#23352)

---
 types/ed2curve/index.d.ts   | 23 +++++------------------
 types/ed2curve/package.json |  6 ++++++
 2 files changed, 11 insertions(+), 18 deletions(-)
 create mode 100644 types/ed2curve/package.json

diff --git a/types/ed2curve/index.d.ts b/types/ed2curve/index.d.ts
index 5dd9b1e748..6b27ee56e4 100644
--- a/types/ed2curve/index.d.ts
+++ b/types/ed2curve/index.d.ts
@@ -4,31 +4,18 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+import { BoxKeyPair, SignKeyPair } from "tweetnacl";
+
 export as namespace ed2curve;
 
-export type Ed25519PublicKey = Uint8Array;
-export type Ed25519SecretKey = Uint8Array;
-export type Curve25519PublicKey = Uint8Array;
-export type Curve25519SecretKey = Uint8Array;
-
-export interface Ed25519KeyPair {
-  publicKey: Ed25519PublicKey;
-  secretKey: Ed25519SecretKey;
-}
-
-export interface Curve25519KeyPair {
-  publicKey: Curve25519PublicKey;
-  secretKey: Curve25519SecretKey;
-}
-
 /**
  * Converts Ed25519 public key to Curve25519 public key.
  * montgomeryX = (edwardsY + 1)*inverse(1 - edwardsY) mod p
  */
-export function convertPublicKey(publicKey: Ed25519PublicKey): Curve25519PublicKey | null;
+export function convertPublicKey(publicKey: SignKeyPair["publicKey"]): BoxKeyPair["publicKey"] | null;
 
 /** Converts Ed25519 secret key to Curve25519 secret key. */
-export function convertSecretKey(secretKey: Ed25519SecretKey): Curve25519SecretKey | null;
+export function convertSecretKey(secretKey: SignKeyPair["secretKey"]): BoxKeyPair["secretKey"] | null;
 
 /** Converts Ed25519 key pair to Curve25519 key pair. */
-export function convertKeyPair(keyPair: Ed25519KeyPair): Curve25519KeyPair;
+export function convertKeyPair(keyPair: SignKeyPair): BoxKeyPair;
diff --git a/types/ed2curve/package.json b/types/ed2curve/package.json
new file mode 100644
index 0000000000..95cfca5ea9
--- /dev/null
+++ b/types/ed2curve/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "tweetnacl": "^1.0.0"
+    }
+}