Export Controller and Env from the package (#515)

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
 
 

electrumx/__init__.py

@@ -0,0 +1,2 @@
+from electrumx.server.controller import Controller
+from electrumx.server.env import Env

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():

electrumx_server.py

@@ -12,8 +12,7 @@
 import logging
 import traceback
 
-from electrumx.server.env import Env
+from electrumx import Controller, Env
-from electrumx.server.controller import Controller
 
 
 def main():

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
 

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 import Controller, Env
-from electrumx.server.controller import Controller
 
 loop = asyncio.get_event_loop()