Defer processing backend error handling to parent

chaind/eth/runnable/queuer.py

@@ -70,20 +70,12 @@ 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):
+    adapter = ChaindFsAdapter(
-        try:
+        settings.get('CHAIN_SPEC'),
-            adapter = ChaindFsAdapter(
+        settings.dir_for('queue'),
-                settings.get('CHAIN_SPEC'),
+        EthCacheTx,
-                settings.dir_for('queue'),
+        dispatcher,
-                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))

requirements.txt

@@ -1,4 +1,4 @@
-chaind~=0.2.0
+chaind~=0.2.2
 hexathon~=0.1.5
 chainlib-eth~=0.1.1
 pyxdg~=0.27

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chaind-eth
-version = 0.2.0
+version = 0.2.1
 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