Implement chainlib basedir override

tests/base.py

@@ -1,54 +0,0 @@
-# standard imports
-import logging
-import unittest
-import tempfile
-import os
-#import pysqlite
-
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from chainsyncer.db import dsn_from_config
-from chainsyncer.db.models.base import SessionBase
-
-script_dir = os.path.realpath(os.path.dirname(__file__))
-
-logging.basicConfig(level=logging.DEBUG)
-
-
-class TestBase(unittest.TestCase):
-
-    def setUp(self):
-        db_dir = tempfile.mkdtemp()
-        self.db_path = os.path.join(db_dir, 'test.sqlite')
-        config = {
-            'DATABASE_ENGINE': 'sqlite',
-            'DATABASE_DRIVER': 'pysqlite',
-            'DATABASE_NAME': self.db_path,
-                }
-        dsn = dsn_from_config(config)
-        SessionBase.poolable = False
-        SessionBase.transactional = False
-        SessionBase.procedural = False
-        SessionBase.connect(dsn, debug=False)
-
-        f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '1.sql'), 'r')
-        sql = f.read()
-        f.close()
-
-        conn = SessionBase.engine.connect()
-        conn.execute(sql)
-
-        f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '2.sql'), 'r')
-        sql = f.read()
-        f.close()
-
-        conn = SessionBase.engine.connect()
-        conn.execute(sql)
-
-        self.chain_spec = ChainSpec('evm', 'foo', 42, 'bar')
-
-    def tearDown(self):
-        SessionBase.disconnect()
-        os.unlink(self.db_path)

tests/chainsyncer_base.py

@@ -0,0 +1,57 @@
+# standard imports
+import logging
+import unittest
+import tempfile
+import os
+#import pysqlite
+
+# external imports
+from chainlib.chain import ChainSpec
+from chainlib.interface import ChainInterface
+from chainlib.eth.tx import receipt
+
+# local imports
+from chainsyncer.db import dsn_from_config
+from chainsyncer.db.models.base import SessionBase
+
+# test imports
+from chainsyncer.unittest.db import ChainSyncerDb
+
+script_dir = os.path.realpath(os.path.dirname(__file__))
+
+logging.basicConfig(level=logging.DEBUG)
+
+
+class EthChainInterface(ChainInterface):
+    
+    def __init__(self):
+        self._tx_receipt = receipt
+
+
+class TestBase(unittest.TestCase):
+
+    interface = EthChainInterface()
+
+    def setUp(self):
+        self.db = ChainSyncerDb()
+        
+        #f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '1.sql'), 'r')
+        #sql = f.read()
+        #f.close()
+
+        #conn = SessionBase.engine.connect()
+        #conn.execute(sql)
+
+        #f = open(os.path.join(script_dir, '..', 'sql', 'sqlite', '2.sql'), 'r')
+        #sql = f.read()
+        #f.close()
+
+        #conn = SessionBase.engine.connect()
+        #conn.execute(sql)
+        self.session = self.db.bind_session()
+        self.chain_spec = ChainSpec('evm', 'foo', 42, 'bar')
+
+    def tearDown(self):
+        self.session.commit()
+        self.db.release_session(self.session)
+        #os.unlink(self.db_path)

tests/test_basic.py

@@ -8,7 +8,7 @@ from chainlib.chain import ChainSpec
 from chainsyncer.backend.memory import MemBackend
 
 # testutil imports
-from tests.base import TestBase
+from tests.chainsyncer_base import TestBase
 
 
 class TestBasic(TestBase):

tests/test_database.py

@@ -11,7 +11,7 @@ from chainsyncer.db.models.filter import BlockchainSyncFilter
 from chainsyncer.backend.sql import SQLBackend
 
 # testutil imports
-from tests.base import TestBase
+from tests.chainsyncer_base import TestBase
 
 logg = logging.getLogger()
 

tests/test_helo.py

@@ -0,0 +1,15 @@
+# standard imports
+import unittest
+
+# local imports
+from tests.chainsyncer_base import TestBase
+
+
+class TestHelo(TestBase):
+
+    def test_helo(self):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_interrupt.py

@@ -16,7 +16,7 @@ from chainsyncer.backend.file import (
     )
 
 # test imports
-from tests.base import TestBase
+from tests.chainsyncer_base import TestBase
 from chainsyncer.unittest.base import (
         MockBlock,
         MockConn,
@@ -77,7 +77,7 @@ class TestInterrupt(TestBase):
                 ]
         
 
-    def assert_filter_interrupt(self, vector):
+    def assert_filter_interrupt(self, vector, chain_interface):
     
         logg.debug('running vector {} {}'.format(str(self.backend), vector))
 
@@ -85,7 +85,7 @@ class TestInterrupt(TestBase):
         for v in vector:
             z += v
 
-        syncer = TestSyncer(self.backend, vector)
+        syncer = TestSyncer(self.backend, chain_interface, vector)
 
         filters =  [
             CountFilter('foo'),
@@ -114,7 +114,7 @@ class TestInterrupt(TestBase):
     def test_filter_interrupt_memory(self):
         for vector in self.vectors:
             self.backend = MemBackend(self.chain_spec, None, target_block=len(vector))
-            self.assert_filter_interrupt(vector)
+            self.assert_filter_interrupt(vector, self.interface)
 
 
     def test_filter_interrupt_file(self):
@@ -123,13 +123,13 @@ class TestInterrupt(TestBase):
             d = tempfile.mkdtemp()
             #os.makedirs(data_dir_for(self.chain_spec, 'foo', d))
             self.backend = FileBackend.initial(self.chain_spec, len(vector), base_dir=d) #'foo', base_dir=d)
-            self.assert_filter_interrupt(vector)
+            self.assert_filter_interrupt(vector, self.interface)
 
 
     def test_filter_interrupt_sql(self):
         for vector in self.vectors:
             self.backend = SQLBackend.initial(self.chain_spec, len(vector))
-            self.assert_filter_interrupt(vector)
+            self.assert_filter_interrupt(vector, self.interface)