Fix type imply

electrumx/server/session/http_session.py

@@ -2,12 +2,12 @@
 
 import json
 from decimal import Decimal
-from typing import Any, Awaitable, Callable
 
 import aiorpcx
 from aiohttp import web
 
 import electrumx.lib.util as util
+from electrumx.server.http_middleware import success_resp, error_resp
 from electrumx.server.session.shared_session import SharedSession
 from electrumx.server.session.util import *
 from electrumx.version import electrumx_version
@@ -20,7 +20,7 @@ def default(self, o):
         return super(DecimalEncoder, self).default(o)
 
 
-async def formatted_request(request, call: Callable[[Any], Awaitable["web.StreamResponse"]]):
+async def formatted_request(request, call):
     params: list
     if request.method == "GET":
         params = json.loads(request.query.get("params", "[]"))
@@ -29,7 +29,11 @@ async def formatted_request(request, call: Callable[[Any], Awaitable["web.Stream
         params = json_data.get("params", [])
     else:
         params = []
-    return await call(*params)
+    try:
+        result = await call(*params)
+        return success_resp(result)
+    except Exception as e:
+        return error_resp(500, e)
 
 
 class HttpHandler(object):

electrumx/server/session/session_base.py

@@ -1,4 +1,4 @@
-from typing import Optional, Tuple, Callable, Dict, TYPE_CHECKING
+from typing import TYPE_CHECKING, Awaitable, Dict, Optional, Tuple
 
 import electrumx.lib.util as util
 import itertools
@@ -57,7 +57,7 @@ def __init__(
         self.session_mgr.add_session(self)
         self.recalc_concurrency()  # must be called after session_mgr.add_session
         self.protocol_tuple: Optional[Tuple[int, ...]] = None
-        self.request_handlers: Optional[Dict[str, Callable]] = None
+        self.request_handlers: Optional[Dict[str, Awaitable]] = None
         # Use the sharing session to manage handlers.
         self.ss = SharedSession(
             self.logger,
@@ -129,7 +129,10 @@ async def handle_request(self, request):
 
         self.session_mgr.method_counts[method] += 1
         coro = handler_invocation(handler, request)()
-        return await coro
+        if isinstance(coro, Awaitable):
+            return await coro
+        else:
+            return coro
 
 
 class LocalRPC(SessionBase):

electrumx/server/session/shared_session.py

@@ -19,7 +19,7 @@
     from electrumx.server.session.session_manager import SessionManager
 
 
-class SharedSession:
+class SharedSession(object):
     def __init__(
             self,
             logger: LoggerAdapter,