Revert "Implement mocks on generic tx, block"

This reverts commit dd1879bb91.

CHANGELOG

@@ -1,6 +1,3 @@
-- 0.2.12
-	* Breaking upgrade of chainlib.
-	* Implement generic block and tx.
 - 0.2.11
 	* Upgrade shep to handle exception in filestore list
 - 0.2.10

chaind/filter.py

@@ -115,7 +115,7 @@ class StateFilter(SyncFilter):
                 queue_adapter = self.__get_adapter(block, force_reload=True)
                 continue
 
-        logg.info('filter registered {} for {} in {}'.format(tx.status_name, tx.hash, block))
+        logg.info('filter registered {} for {} in {}'.format(tx.status.name, tx.hash, block))
 
         if self.throttler != None:
             self.throttler.dec(tx.hash)

chaind/settings.py

@@ -4,7 +4,6 @@ import os
 import uuid
 
 # external imports
-from chainlib.settings import ChainSettings
 from chainsyncer.settings import ChainsyncerSettings
 from chainqueue.settings import ChainqueueSettings
 
@@ -107,39 +106,18 @@ class ChaindSettings(ChainsyncerSettings, ChainqueueSettings):
             raise ValueError('at least one backend must be set')
 
 
-    def process_chaind_queue(self, config):
-        if config.get('QUEUE_STATE_PATH') == None:
-            queue_state_dir = self.dir_for('queue')
-            config.add(queue_state_dir, 'QUEUE_STATE_PATH', False)
-            logg.debug('setting queue state path {}'.format(queue_state_dir))
-        
-        self.process_queue_tx(config)
-        self.process_queue_paths(config)
-        if config.get('QUEUE_BACKEND') == 'fs':
-            self.process_queue_backend_fs(config)
-        self.process_queue_backend(config)
-        self.process_queue_store(config)
-
-
     def process(self, config):
-        #super(ChaindSettings, self).process(config)
+        super(ChaindSettings, self).process(config)
-        self.process_common(config)
-
-        if self.include_queue:
-            self.process_queue_backend(config)
-        if self.include_sync:
-            self.process_sync_backend(config)
-
-        self.process_backend(config)
-        self.process_session(config)
-
         if self.include_sync:
             self.process_sync(config)
+            self.process_sync_backend(config)
         if self.include_queue:
-            self.process_chaind_queue(config)
+            self.process_queue_backend(config)
             self.process_dispatch(config)
             self.process_token(config)
 
+        self.process_backend(config)
+        self.process_session(config)
         self.process_socket(config)
 
 

chaind/unittest/common.py

@@ -7,11 +7,6 @@ from chainqueue.cache import CacheTokenTx
 from chainlib.status import Status as TxStatus
 from chainlib.chain import ChainSpec
 from chainlib.error import RPCException
-from chainlib.tx import (
-        Tx,
-        TxResult,
-        )
-from chainlib.block import Block
 
 
 class MockCacheAdapter(CacheTokenTx):
@@ -39,17 +34,14 @@ class MockDispatcher:
         pass
 
 
-class MockTx(Tx):
+class MockTx:
 
     def __init__(self, tx_hash, status=TxStatus.SUCCESS):
-        result = TxResult()
+        self.hash = tx_hash
-        result.status = status
+        self.status = status
-        super(MockTx, self).__init__(result=result)
-        self.set_hash(tx_hash)
 
 
-class MockBlock(Block):
+class MockBlock:
 
     def __init__(self, number):
-        super(MockBlock, self).__init__()
         self.number = number

requirements.txt

@@ -1,6 +1,6 @@
-chainlib~=0.2.0
+chainlib~=0.1.2
-chainqueue~=0.1.16
+chainqueue~=0.1.15
-chainsyncer~=0.4.9
+chainsyncer~=0.4.7
 confini~=0.6.0
 funga~=0.5.2
 pyxdg~=0.26

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chaind
-version = 0.2.12
+version = 0.2.11
 description = Base package for chain queue service
 author = Louis Holbrook
 author_email = dev@holbrook.no