Factor out outgoing processor

.gitignore

@@ -6,3 +6,4 @@ build/
 *.egg-info
 *.sqlite
 .coverage
+.chaind

chaind/eth/runnable/queuer.py

@@ -28,11 +28,12 @@ from chainqueue.cache import CacheTokenTx
 from chainlib.encode import TxHexNormalizer
 from chainlib.chain import ChainSpec
 from chaind.adapters.fs import ChaindFsAdapter
+from chaind.dispatch import DispatchProcessor
 
 # local imports
-from chaind.eth.dispatch import EthDispatcher
 from chaind.eth.cache import EthCacheTx
 from chaind.eth.settings import ChaindEthSettings
+from chaind.eth.dispatch import EthDispatcher
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -66,49 +67,16 @@ settings.process(config)
 
 logg.debug('settings:\n{}'.format(settings))
 
-
-def process_outgoing(chain_spec, adapter, rpc, limit=50):
-    adapter = None
-    process_err = None
-    for i in range(2):
-        try:
-            adapter = ChaindFsAdapter(
-                settings.get('CHAIN_SPEC'),
-                settings.dir_for('queue'),
-                EthCacheTx,
-                dispatcher,
-                )
-        except BackendIntegrityError as e:
-            process_err = e
-            continue
-
-    if adapter == None:
-        raise BackendIntegrityError(process_err)
-    
-    upcoming = adapter.upcoming(limit=limit)
-    logg.info('processor has {} candidates for {}, processing with limit {} adapter {} rpc {}'.format(len(upcoming), chain_spec, limit, adapter, rpc))
-    i = 0
-    for tx_hash in upcoming:
-        if adapter.dispatch(tx_hash):
-            i += 1
-    return i
-
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
 rpc = chainlib.eth.cli.Rpc()
 conn = rpc.connect_by_config(config)
 
 tx_normalizer = TxHexNormalizer().tx_hash
-token_cache_store = CacheTokenTx(chain_spec, normalizer=tx_normalizer)
-dispatcher = EthDispatcher(conn)
-queue_adapter = ChaindFsAdapter(
-        settings.get('CHAIN_SPEC'),
-        settings.dir_for('queue'),
-        EthCacheTx,
-        dispatcher,
-        )
+token_cache_store = CacheTokenTx(settings.get('CHAIN_SPEC'), normalizer=tx_normalizer)
+
+dispatcher = EthDispatcher(conn)
+processor = DispatchProcessor(settings.get('CHAIN_SPEC'), settings.dir_for('queue'), dispatcher)
+ctrl = SessionController(settings, processor.process)
 
-ctrl = SessionController(settings, queue_adapter, process_outgoing)
 signal.signal(signal.SIGINT, ctrl.shutdown)
 signal.signal(signal.SIGTERM, ctrl.shutdown)
 
@@ -134,6 +102,14 @@ def main():
             ctrl.process(conn)
             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:

requirements.txt

@@ -1,6 +1,6 @@
-chaind~=0.2.0
+chaind~=0.2.4
 hexathon~=0.1.5
 chainlib-eth~=0.1.1
 pyxdg~=0.27
-shep~=0.2.3
+shep~=0.2.5
 funga-eth~=0.6.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chaind-eth
-version = 0.2.0
+version = 0.2.2
 description = Queue server for ethereum
 author = Louis Holbrook
 author_email = dev@holbrook.no

tests/test_tx.py

@@ -11,7 +11,7 @@ from chainlib.chain import ChainSpec
 from chainqueue.cache import CacheTokenTx
 from chainlib.error import RPCException
 from chainlib.status import Status as TxStatus
-from chaind.unittest.common import TestChaindFsBase
+from chaind.unittest.fs import TestChaindFsBase
 from chaind.driver import QueueDriver
 from chaind.filter import StateFilter
 from chainlib.eth.gas import Gas