Merge remote-tracking branch 'origin/master' into lash/import-scripts-refactor

apps/cic-eth/cic_eth/db/models/base.py

@@ -54,11 +54,7 @@ class SessionBase(Model):
 
 
     @staticmethod
-<<<<<<< HEAD
-    def connect(dsn, pool_size=5, debug=False):
-=======
     def connect(dsn, pool_size=8, debug=False):
->>>>>>> origin/master
         """Create new database connection engine and connect to database backend.
 
         :param dsn: DSN string defining connection.
@@ -66,16 +62,6 @@ class SessionBase(Model):
         """
         e = None
         if SessionBase.poolable:
-<<<<<<< HEAD
-            e = create_engine(
-                    dsn,
-                    max_overflow=pool_size*3,
-                    pool_pre_ping=True,
-                    pool_size=pool_size,
-                    pool_recycle=10,
-                    echo=debug,
-                )
-=======
             poolclass = QueuePool
             if pool_size > 1:
                 e = create_engine(
@@ -98,7 +84,6 @@ class SessionBase(Model):
                         poolclass=poolclass,
                         echo=debug,
                     )
->>>>>>> origin/master
         else:
             e = create_engine(
                     dsn,

apps/cic-eth/cic_eth/runnable/daemons/filters/gas.py

@@ -18,14 +18,9 @@ logg = logging.getLogger()
 
 class GasFilter(SyncFilter):
 
-<<<<<<< HEAD
-    def __init__(self, queue, gas_provider):
-=======
     def __init__(self, gas_provider, queue=None):
         self.queue = queue
->>>>>>> origin/master
         self.gas_provider = gas_provider
-        self.queue = queue
 
 
     def filter(self, w3, tx, rcpt, chain_str, session=None):
@@ -45,13 +40,9 @@ class GasFilter(SyncFilter):
                 return
 
             chain_spec = ChainSpec.from_chain_str(chain_str)
-<<<<<<< HEAD
-            txs = get_paused_txs(StatusBits.GAS_ISSUES, r[0], chain_spec.chain_id())
-=======
             txs = get_paused_txs(StatusEnum.WAITFORGAS, r[0], chain_spec.chain_id(), session=session)
 
             SessionBase.release_session(session)
->>>>>>> origin/master
 
             if len(txs) > 0:
                 logg.info('resuming gas-in-waiting txs for {}: {}'.format(r[0], txs.keys()))

apps/cic-eth/cic_eth/runnable/daemons/filters/register.py

@@ -15,15 +15,11 @@ account_registry_add_log_hash = '0x5ed3bdd47b9af629827a8d129aa39c870b10c03f0153f
 
 class RegistrationFilter(SyncFilter):
 
-<<<<<<< HEAD
     def __init__(self, queue):
         self.queue = queue
 
 
-    def filter(self, w3, tx, rcpt, chain_spec):
-=======
     def filter(self, w3, tx, rcpt, chain_spec, session=None):
->>>>>>> origin/master
         logg.debug('applying registration filter')
         registered_address = None
         for l in rcpt['logs']:

apps/cic-eth/cic_eth/runnable/daemons/manager.py

@@ -180,11 +180,7 @@ def main():
 
     registration_filter = RegistrationFilter(queue)
 
-<<<<<<< HEAD
-    gas_filter = GasFilter(queue, c.gas_provider())
-=======
     gas_filter = GasFilter(c.gas_provider(), queue)
->>>>>>> origin/master
 
     i = 0
     for syncer in syncers: