Merge remote-tracking branch 'origin/master' into lash/external-chain-queue

This commit is contained in:
nolash 2021-04-05 17:02:09 +02:00
commit 428c0983f6
3 changed files with 2 additions and 4 deletions

View File

@ -52,7 +52,6 @@ class TxFilter(SyncFilter):
], ],
queue=self.queue, queue=self.queue,
) )
#s_final_state.link(s_obsolete_state)
t = celery.group(s_obsolete_state, s_final_state)() t = celery.group(s_obsolete_state, s_final_state)()
return t return t

View File

@ -80,7 +80,7 @@ straggler_delay = int(config.get('CIC_TX_RETRY_DELAY'))
# logg.debug('submitting tx {} for retry'.format(tx_hash)) # logg.debug('submitting tx {} for retry'.format(tx_hash))
# s_check = celery.signature( # s_check = celery.signature(
# 'cic_eth.admin.ctrl.check_lock', # 'cic_eth.admin.ctrl.check_lock',
# [ [
# tx_hash, # tx_hash,
# chain_str, # chain_str,
# LockEnum.QUEUE, # LockEnum.QUEUE,
@ -115,7 +115,6 @@ straggler_delay = int(config.get('CIC_TX_RETRY_DELAY'))
# s_check.apply_async() # s_check.apply_async()
def main(): def main():
conn = RPCConnection.connect(chain_spec, 'default') conn = RPCConnection.connect(chain_spec, 'default')
syncer = RetrySyncer(conn, chain_spec, straggler_delay, batch_size=config.get('_BATCH_SIZE')) syncer = RetrySyncer(conn, chain_spec, straggler_delay, batch_size=config.get('_BATCH_SIZE'))

View File

@ -1,4 +1,4 @@
cic-base[full_graph]==0.1.2a58 cic-base[full_graph]==0.1.2a60
sarafu-faucet==0.0.2a16 sarafu-faucet==0.0.2a16
cic-eth==0.11.0a4 cic-eth==0.11.0a4
cic-types==0.1.0a10 cic-types==0.1.0a10