From c28b5af309ff05ea5645c11b36def169ee5a3544 Mon Sep 17 00:00:00 2001
From: Neil <kyuupichan@gmail.com>
Date: Tue, 10 Jul 2018 14:17:49 +0800
Subject: [PATCH] Export Controller and Env from the package (#515)

---
 compact_history.py       | 2 +-
 electrumx/__init__.py    | 2 ++
 electrumx_rpc.py         | 2 +-
 electrumx_server.py      | 3 +--
 query.py                 | 2 +-
 tests/server/test_api.py | 3 +--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compact_history.py b/compact_history.py
index 58db9f0..134b454 100755
--- a/compact_history.py
+++ b/compact_history.py
@@ -36,7 +36,7 @@ import sys
 import traceback
 from os import environ
 
-from electrumx.server.env import Env
+from electrumx import Env
 from electrumx.server.db import DB
 
 
diff --git a/electrumx/__init__.py b/electrumx/__init__.py
index e69de29..517c9ff 100644
--- a/electrumx/__init__.py
+++ b/electrumx/__init__.py
@@ -0,0 +1,2 @@
+from electrumx.server.controller import Controller
+from electrumx.server.env import Env
diff --git a/electrumx_rpc.py b/electrumx_rpc.py
index 3f1172e..09d24ca 100755
--- a/electrumx_rpc.py
+++ b/electrumx_rpc.py
@@ -17,7 +17,7 @@ from os import environ
 
 from aiorpcx import ClientSession
 
-from electrumx.server.controller import Controller
+from electrumx import Controller
 
 
 def main():
diff --git a/electrumx_server.py b/electrumx_server.py
index 3e1c7fb..fc1e0c1 100755
--- a/electrumx_server.py
+++ b/electrumx_server.py
@@ -12,8 +12,7 @@
 import logging
 import traceback
 
-from electrumx.server.env import Env
-from electrumx.server.controller import Controller
+from electrumx import Controller, Env
 
 
 def main():
diff --git a/query.py b/query.py
index eadcdc9..06d983f 100755
--- a/query.py
+++ b/query.py
@@ -15,7 +15,7 @@ Not currently documented; might become easier to use in future.
 
 import sys
 
-from electrumx.server.env import Env
+from electrumx import Env
 from electrumx.server.db import DB
 from electrumx.lib.hash import hash_to_str
 
diff --git a/tests/server/test_api.py b/tests/server/test_api.py
index 3d2c319..eb8b951 100644
--- a/tests/server/test_api.py
+++ b/tests/server/test_api.py
@@ -2,8 +2,7 @@ import asyncio
 from unittest import mock
 
 from aiorpcx import RPCError
-from electrumx.server.env import Env
-from electrumx.server.controller import Controller
+from electrumx import Controller, Env
 
 loop = asyncio.get_event_loop()