From 452e9616782e979fa3cee5643c551e9006caf363 Mon Sep 17 00:00:00 2001 From: nolash Date: Thu, 3 Jun 2021 15:09:46 +0200 Subject: [PATCH] Update queue/syncer module structure --- apps/cic-eth/cic_eth/ext/tx.py | 2 +- apps/cic-eth/cic_eth/queue/query.py | 2 +- apps/cic-eth/cic_eth/queue/state.py | 2 +- apps/cic-eth/cic_eth/queue/tx.py | 4 ++-- apps/cic-eth/requirements.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/cic-eth/cic_eth/ext/tx.py b/apps/cic-eth/cic_eth/ext/tx.py index dc9f0ad2..007b4136 100644 --- a/apps/cic-eth/cic_eth/ext/tx.py +++ b/apps/cic-eth/cic_eth/ext/tx.py @@ -19,7 +19,7 @@ from cic_eth_registry import CICRegistry from cic_eth_registry.erc20 import ERC20Token from chainqueue.db.models.otx import Otx from chainqueue.db.enum import StatusEnum -from chainqueue.query import get_tx_cache +from chainqueue.sql.query import get_tx_cache from eth_erc20 import ERC20 # local imports diff --git a/apps/cic-eth/cic_eth/queue/query.py b/apps/cic-eth/cic_eth/queue/query.py index 44ed7547..40dcfbeb 100644 --- a/apps/cic-eth/cic_eth/queue/query.py +++ b/apps/cic-eth/cic_eth/queue/query.py @@ -5,7 +5,7 @@ import datetime import celery from chainlib.chain import ChainSpec from chainlib.eth.tx import unpack -import chainqueue.query +import chainqueue.sql.query from chainqueue.db.enum import ( StatusEnum, is_alive, diff --git a/apps/cic-eth/cic_eth/queue/state.py b/apps/cic-eth/cic_eth/queue/state.py index 89d5ce40..b97eaa1e 100644 --- a/apps/cic-eth/cic_eth/queue/state.py +++ b/apps/cic-eth/cic_eth/queue/state.py @@ -1,6 +1,6 @@ # external imports from chainlib.chain import ChainSpec -import chainqueue.state +import chainqueue.sql.state # local imports import celery diff --git a/apps/cic-eth/cic_eth/queue/tx.py b/apps/cic-eth/cic_eth/queue/tx.py index 841f45b5..2afa9187 100644 --- a/apps/cic-eth/cic_eth/queue/tx.py +++ b/apps/cic-eth/cic_eth/queue/tx.py @@ -15,14 +15,14 @@ from sqlalchemy import tuple_ from sqlalchemy import func from chainlib.chain import ChainSpec from chainlib.eth.tx import unpack -import chainqueue.state +import chainqueue.sql.state from chainqueue.db.enum import ( StatusEnum, StatusBits, is_alive, dead, ) -from chainqueue.tx import create +from chainqueue.sql.tx import create from chainqueue.error import NotLocalTxError from chainqueue.db.enum import status_str diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index a7ed3ae5..af704c62 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -16,8 +16,8 @@ moolb~=0.1.1b2 eth-address-index~=0.1.1a11 chainlib~=0.0.3rc2 hexathon~=0.0.1a7 -chainsyncer[sql]~=0.0.2a4 -chainqueue~=0.0.2b1 +chainsyncer[sql]~=0.0.2a5 +chainqueue~=0.0.2b3 sarafu-faucet==0.0.3a3 erc20-faucet==0.2.1a4 coincurve==15.0.0