From 51f7cdb845b6e36b0485170e40d92bda12a48c22 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 24 Jun 2018 15:27:48 +0200
Subject: [PATCH] Adjust namespaces

---
 types/blakejs/index.d.ts | 46 +++++++++++++++++++++++-----------------
 types/libp2p/index.d.ts  |  6 +++---
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/types/blakejs/index.d.ts b/types/blakejs/index.d.ts
index 80651bc..cb4c7f6 100644
--- a/types/blakejs/index.d.ts
+++ b/types/blakejs/index.d.ts
@@ -5,29 +5,35 @@
 
 /// <reference types="node"/>
 
-declare module 'blakejs' {
-type BlakeJsContext = {
-    b: Uint8Array,
-    h: Uint32Array,
-    t: number,
-    c: number,
-    outlen: number
-};
+declare namespace blakejs {
+    type Context = {
+        b: Uint8Array,
+        h: Uint32Array,
+        t: number,
+        c: number,
+        outlen: number
+    };
 
-type BlakeJs = {
-    blake2b: (data: Buffer | Uint8Array | string, key?: Uint8Array | null, outlen?: number) => Uint8Array,
-    blake2bFinal: (context: BlakeJsContext) => Uint8Array,
-    blake2bHex: (data: Buffer | Uint8Array | string, key?: Uint8Array | null, outlen?: number) => string,
-    blake2bInit: (outlen?: number, key?: Uint8Array) => BlakeJsContext,
-    blake2bUpdate: (context: BlakeJsContext, data: Buffer | Uint8Array | string) => void,
-    blake2s: (data: Buffer | Uint8Array | string, key?: Uint8Array | null, outlen?: number) => Uint8Array,
-    blake2sFinal: (context: BlakeJsContext) => Uint8Array,
-    blake2sHex: (data: Buffer | Uint8Array | string, key?: Uint8Array | null, outlen?: number) => string,
-    blake2sInit: (outlen?: number, key?: Uint8Array) => BlakeJsContext,
-    blake2sUpdate: (context: BlakeJsContext, data: Buffer | Uint8Array | string) => void
+    type Data = Buffer | Uint8Array | string;
+
+    type Key = Uint8Array | null;
+
+    interface BlakeJs {
+        blake2b: (data: Data, key?: Key, outlen?: number) => Uint8Array,
+        blake2bFinal: (context: Context) => Uint8Array,
+        blake2bHex: (data: Data, key?: Key, outlen?: number) => string,
+        blake2bInit: (outlen?: number, key?: Key) => Context,
+        blake2bUpdate: (context: Context, data: Data) => void,
+        blake2s: (data: Data, key?: Key, outlen?: number) => Uint8Array,
+        blake2sFinal: (context: Context) => Uint8Array,
+        blake2sHex: (data: Data, key?: Key, outlen?: number) => string,
+        blake2sInit: (outlen?: number, key?: Key) => Context,
+        blake2sUpdate: (context: Context, data: Data) => void
+    }
 }
 
-const blakejs: BlakeJs;
+declare module 'blakejs' {
+const blakejs: blakejs.BlakeJs;
 
 export default blakejs;
 }
diff --git a/types/libp2p/index.d.ts b/types/libp2p/index.d.ts
index 50940df..fb46786 100644
--- a/types/libp2p/index.d.ts
+++ b/types/libp2p/index.d.ts
@@ -15,7 +15,7 @@
 /// <reference types="peer-info"/>
 
 declare namespace LibP2p {
-    type CreateOptions = {
+    export type Config = {
         DHT: typeof LibP2pKadDht,
         connection: {
             crypto: Array<LibP2pSecio>,
@@ -25,11 +25,11 @@ declare namespace LibP2p {
         transport: LibP2pTransport[]
     };
 
-    type Events = 'peer:connect' | 'peer:disconnect' | 'peer:discovery' | 'start' | 'stop';
+    export type Events = 'peer:connect' | 'peer:disconnect' | 'peer:discovery' | 'start' | 'stop';
 }
 
 declare class LibP2p {
-    constructor (peerInfo: PeerInfo, PeerBook: PeerBook, options: LibP2p.CreateOptions);
+    constructor (peerInfo: PeerInfo, PeerBook: PeerBook, options: LibP2p.Config);
 
     dial (peerInfo: PeerInfo, cb: (error: Error | null) => any): void;
     dialProtocol (peerInfo: PeerInfo, protocol: string, cb: (error: Error | null, conn?: LibP2pConnection) => any): void;