From 487d259d1e5547da4efc39ca7658083ede4f042a Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 17 Dec 2018 18:46:29 +0100
Subject: [PATCH 1/2] merge

---
 src/squid.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/squid.ts b/src/squid.ts
index 6968386..0552598 100644
--- a/src/squid.ts
+++ b/src/squid.ts
@@ -6,6 +6,8 @@ import ServiceAgreementTemplate from "./ocean/ServiceAgreements/ServiceAgreement
 import Access from "./ocean/ServiceAgreements/Templates/Access"
 import FitchainCompute from "./ocean/ServiceAgreements/Templates/FitchainCompute"
 import Logger from "./utils/Logger"
+import WebServiceConnectorProvider from "./utils/WebServiceConnectorProvider"
+import SecretStoreProvider from "./secretstore/SecretStoreProvider"
 
 const Templates = {Access, FitchainCompute}
 
@@ -17,4 +19,6 @@ export {
     Templates,
     Account,
     EventListener,
+    WebServiceConnectorProvider,
+    SecretStoreProvider,
 }

From 800850e288dae05f1a38e9ce37556a29b0dc97c2 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 17 Dec 2018 22:41:47 +0100
Subject: [PATCH 2/2] expose DID and IdGenerator

---
 src/squid.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/squid.ts b/src/squid.ts
index ce94b5f..5e93104 100644
--- a/src/squid.ts
+++ b/src/squid.ts
@@ -7,6 +7,8 @@ import FitchainCompute from "./ocean/ServiceAgreements/Templates/FitchainCompute
 import Logger from "./utils/Logger"
 import WebServiceConnectorProvider from "./utils/WebServiceConnectorProvider"
 import SecretStoreProvider from "./secretstore/SecretStoreProvider"
+import IdGenerator from "./ocean/IdGenerator"
+import DID from './ocean/DID'
 
 import EventListener from "./keeper/EventListener"
 
@@ -19,6 +21,8 @@ export {
     Logger,
     Templates,
     Account,
+    IdGenerator,
+    DID,
     EventListener,
     WebServiceConnectorProvider,
     SecretStoreProvider,