diff --git a/chaind/eth/runnable/queuer.py b/chaind/eth/runnable/queuer.py index 91abfa8..ecc2c26 100644 --- a/chaind/eth/runnable/queuer.py +++ b/chaind/eth/runnable/queuer.py @@ -83,7 +83,18 @@ signal.signal(signal.SIGTERM, ctrl.shutdown) logg.info('session id is ' + settings.get('SESSION_ID')) logg.info('session socket path is ' + settings.get('SESSION_SOCKET_PATH')) + def main(): + global dispatcher, settings + + queue_adapter = ChaindFsAdapter( + settings.get('CHAIN_SPEC'), + settings.dir_for('queue'), + EthCacheTx, + dispatcher, + store_sync=False, + ) + while True: v = None client_socket = None @@ -100,16 +111,9 @@ def main(): if v == None: ctrl.process(conn) + #queue_adapter = create_adapter(settings, dispatcher) continue - queue_adapter = ChaindFsAdapter( - settings.get('CHAIN_SPEC'), - settings.dir_for('queue'), - EthCacheTx, - dispatcher, - store_sync=False, - ) - result_data = None r = 0 # no error try: diff --git a/requirements.txt b/requirements.txt index 79de9b3..08c1e90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ -chaind~=0.2.7 +chaind~=0.2.10 hexathon~=0.1.6 chainlib-eth~=0.1.2 pyxdg~=0.27 -shep~=0.2.5 funga-eth~=0.6.1 diff --git a/setup.cfg b/setup.cfg index 4d589bc..f4405c2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chaind-eth -version = 0.2.6 +version = 0.2.9 description = Queue server for ethereum author = Louis Holbrook author_email = dev@holbrook.no