From 82e26745556103a6cf5014d02d955d1396bf3d69 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sat, 20 Feb 2021 21:11:09 +0100
Subject: [PATCH] Change progress callback signature order

---
 chainsyncer/backend.py |  9 +++++++++
 chainsyncer/driver.py  | 27 +++++++++++++++------------
 chainsyncer/filter.py  |  3 +++
 setup.cfg              |  2 +-
 tests/base.py          |  2 --
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/chainsyncer/backend.py b/chainsyncer/backend.py
index 1926e27..3380bfc 100644
--- a/chainsyncer/backend.py
+++ b/chainsyncer/backend.py
@@ -209,6 +209,15 @@ class MemBackend:
         self.chain_spec = chain_spec
         self.block_height = 0
         self.tx_height = 0
+        self.db_session = None
+
+
+    def connect(self):
+        pass
+
+
+    def disconnect(self):
+        pass
 
 
     def set(self, block_height, tx_height):
diff --git a/chainsyncer/driver.py b/chainsyncer/driver.py
index bba7e4c..2309eea 100644
--- a/chainsyncer/driver.py
+++ b/chainsyncer/driver.py
@@ -15,7 +15,7 @@ from chainsyncer.filter import SyncFilter
 logg = logging.getLogger()
 
 
-def noop_progress(s, block_number, tx_index):
+def noop_callback(block_number, tx_index, s=None):
     logg.debug('({},{}) {}'.format(block_number, tx_index, s))
 
 
@@ -24,12 +24,13 @@ class Syncer:
     running_global = True
     yield_delay=0.005
 
-    def __init__(self, backend, progress_callback=noop_progress):
+    def __init__(self, backend, loop_callback=noop_callback, progress_callback=noop_callback):
         self.cursor = None
         self.running = True
         self.backend = backend
         self.filter = SyncFilter(backend)
         self.progress_callback = progress_callback
+        self.loop_callback = loop_callback
 
 
     def chain(self):
@@ -45,18 +46,20 @@ class Syncer:
         self.filter.add(f)
 
 
-class BlockSyncer(Syncer):
+class BlockPollSyncer(Syncer):
 
-    def __init__(self, backend, progress_callback=noop_progress):
-        super(BlockSyncer, self).__init__(backend, progress_callback)
+    def __init__(self, backend, loop_callback=noop_callback, progress_callback=noop_callback):
+        super(BlockPollSyncer, self).__init__(backend, loop_callback, progress_callback)
 
 
     def loop(self, interval, conn):
         g = self.backend.get()
         last_tx = g[1]
         last_block = g[0]
-        self.progress_callback('loop started', last_block, last_tx)
+        self.progress_callback(last_block, last_tx, 'loop started')
         while self.running and Syncer.running_global:
+            if self.loop_callback != None:
+                self.loop_callback(last_block, last_tx)
             while True:
                 try:
                     block = self.get(conn)
@@ -65,16 +68,16 @@ class BlockSyncer(Syncer):
                 last_block = block.number
                 self.process(conn, block)
                 start_tx = 0
-                self.progress_callback('processed block {}'.format(self.backend.get()), last_block, last_tx)
+                self.progress_callback(last_block, last_tx, 'processed block {}'.format(self.backend.get()))
                 time.sleep(self.yield_delay)
-            self.progress_callback('loop ended', last_block + 1, last_tx)
+            self.progress_callback(last_block + 1, last_tx, 'loop ended')
             time.sleep(interval)
 
 
-class HeadSyncer(BlockSyncer):
+class HeadSyncer(BlockPollSyncer):
 
-    def __init__(self, backend, progress_callback=noop_progress):
-        super(HeadSyncer, self).__init__(backend, progress_callback)
+    def __init__(self, backend, loop_callback=noop_callback, progress_callback=noop_callback):
+        super(HeadSyncer, self).__init__(backend, loop_callback, progress_callback)
 
 
     def process(self, conn, block):
@@ -84,7 +87,7 @@ class HeadSyncer(BlockSyncer):
         while True:
             try:
                 tx = block.tx(i)
-                self.progress_callback('processing {}'.format(repr(tx)), block.number, i)
+                self.progress_callback(block.number, i, 'processing {}'.format(repr(tx)))
                 self.backend.set(block.number, i)
                 self.filter.apply(conn, block, tx)
             except IndexError as e:
diff --git a/chainsyncer/filter.py b/chainsyncer/filter.py
index 6b4fdbc..e488b8c 100644
--- a/chainsyncer/filter.py
+++ b/chainsyncer/filter.py
@@ -1,6 +1,9 @@
 # standard imports
 import logging
 
+# external imports
+import sqlalchemy
+
 # local imports
 from .error import BackendError
 
diff --git a/setup.cfg b/setup.cfg
index a3d8632..04005e0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = chainsyncer
-version = 0.0.1a8
+version = 0.0.1a10
 description = Generic blockchain syncer driver
 author = Louis Holbrook
 author_email = dev@holbrook.no
diff --git a/tests/base.py b/tests/base.py
index 45ae722..6729eb9 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -42,5 +42,3 @@ class TestBase(unittest.TestCase):
     def tearDown(self):
         SessionBase.disconnect()
         os.unlink(self.db_path)
-
-