Use external chain queue engine

apps/cic-eth/tests/task/api/test_admin.py

@@ -16,27 +16,22 @@ from hexathon import (
         strip_0x,
         add_0x,
         )
+from chainqueue.db.models.otx import Otx
+from chainqueue.db.models.tx import TxCache
+from chainqueue.db.enum import (
+        StatusEnum,
+        StatusBits,
+        status_str,
+        )
+from chainqueue.query import get_tx
 
 # local imports
 from cic_eth.api import AdminApi
 from cic_eth.db.models.role import AccountRole
-from cic_eth.db.models.otx import Otx
-from cic_eth.db.models.tx import TxCache
-from cic_eth.db.enum import (
-        StatusEnum,
-        StatusBits,
-        status_str,
-        LockEnum,
-        )
+from cic_eth.db.enum import LockEnum
 from cic_eth.error import InitializationError
-from cic_eth.eth.tx import (
-        cache_gas_data,
-        )
-#from cic_eth.eth.gas import cache_gas_tx
-from cic_eth.queue.tx import (
-        create as queue_create,
-        get_tx,
-        )
+from cic_eth.eth.gas import cache_gas_data
+from cic_eth.queue.tx import queue_create
 
 logg = logging.getLogger()
 
@@ -56,7 +51,7 @@ logg = logging.getLogger()
 #    gas_provider = c.gas_provider()
 #
 #    s_nonce = celery.signature(
-#        'cic_eth.eth.tx.reserve_nonce',
+#        'cic_eth.eth.nonce.reserve_nonce',
 #        [
 #            init_w3.eth.accounts[0],
 #            gas_provider,
@@ -64,7 +59,7 @@ logg = logging.getLogger()
 #        queue=None,
 #        )
 #    s_refill = celery.signature(
-#        'cic_eth.eth.tx.refill_gas',
+#        'cic_eth.eth.gas.refill_gas',
 #        [
 #            chain_str,
 #            ],
@@ -83,7 +78,7 @@ logg = logging.getLogger()
 #    o = q.first()
 #    tx_raw = o.signed_tx
 #
-#    tx_dict = unpack_signed_raw_tx(bytes.fromhex(tx_raw[2:]), default_chain_spec.chain_id())
+#    tx_dict = unpack(bytes.fromhex(tx_raw), default_chain_spec)
 #    gas_price_before = tx_dict['gasPrice'] 
 #
 #    s = celery.signature(
@@ -109,7 +104,7 @@ logg = logging.getLogger()
 #  
 #    tx_raw_new = get_tx(tx_hash_new_hex) 
 #    logg.debug('get {}'.format(tx_raw_new))
-#    tx_dict_new = unpack_signed_raw_tx(bytes.fromhex(tx_raw_new['signed_tx'][2:]), default_chain_spec.chain_id())
+#    tx_dict_new = unpack(bytes.fromhex(tx_raw_new['signed_tx']), default_chain_spec)
 #    assert tx_hash_new_hex != tx_dict['hash']
 #    assert tx_dict_new['gasPrice'] > gas_price_before
 #
@@ -133,7 +128,7 @@ logg = logging.getLogger()
 #    sigs = []
 #    for i in range(5):
 #        s = celery.signature(
-#            'cic_eth.eth.tx.refill_gas',
+#            'cic_eth.eth.gas.refill_gas',
 #            [
 #                eth_empty_accounts[i],
 #                chain_str,
@@ -278,15 +273,14 @@ def test_tx(
     eth_signer,
     agent_roles,
     contract_roles,
-    celery_session_worker,
+    celery_worker,
     ):
 
-    chain_id = default_chain_spec.chain_id()
     nonce_oracle = RPCNonceOracle(agent_roles['ALICE'], eth_rpc)
-    c = Gas(signer=eth_signer, nonce_oracle=nonce_oracle, chain_id=chain_id)
+    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
     (tx_hash_hex, tx_signed_raw_hex) = c.create(agent_roles['ALICE'], agent_roles['BOB'], 1024, tx_format=TxFormat.RLP_SIGNED)
-    tx = unpack(bytes.fromhex(strip_0x(tx_signed_raw_hex)), chain_id)
-    queue_create(tx['nonce'], agent_roles['ALICE'], tx_hash_hex, tx_signed_raw_hex, default_chain_spec, session=init_database)
+    tx = unpack(bytes.fromhex(strip_0x(tx_signed_raw_hex)), default_chain_spec)
+    queue_create(default_chain_spec, tx['nonce'], agent_roles['ALICE'], tx_hash_hex, tx_signed_raw_hex)
     cache_gas_data(tx_hash_hex, tx_signed_raw_hex, default_chain_spec.asdict())
 
     api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['DEFAULT'])

apps/cic-eth/tests/task/api/test_list.py

@@ -1,23 +1,29 @@
 # standard imports
 import logging
 
-# local imports
+# external imports
+import pytest
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.erc20 import ERC20
 from chainlib.eth.tx import receipt
+
+# local imports
 from cic_eth.api.api_task import Api
-from tests.mock.filter import (
-        block_filter,
-        tx_filter,
-        )
 from cic_eth.db.models.nonce import (
         Nonce,
         NonceReservation,
         )
 
+# test imports
+from tests.mock.filter import (
+        block_filter,
+        tx_filter,
+        )
+
 logg = logging.getLogger()
 
 
+@pytest.mark.xfail()
 def test_list_tx(
         default_chain_spec,
         init_database,
@@ -29,11 +35,9 @@ def test_list_tx(
         foo_token,
         register_tokens,
         init_eth_tester,
-        celery_session_worker,
+        celery_worker,
         ):
 
-    chain_id = default_chain_spec.chain_id()
-
     tx_hashes = []
 
     # external tx
@@ -53,7 +57,7 @@ def test_list_tx(
     init_database.commit()
 
     init_eth_tester.mine_blocks(13)
-    c = ERC20(signer=eth_signer, nonce_oracle=nonce_oracle, chain_id=chain_id)
+    c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
     (tx_hash_hex, o) = c.transfer(foo_token, custodial_roles['FOO_TOKEN_GIFTER'], agent_roles['ALICE'], 1024)
     eth_rpc.do(o)
     o = receipt(tx_hash_hex)
@@ -73,7 +77,7 @@ def test_list_tx(
 
     init_eth_tester.mine_blocks(13)
     nonce_oracle = RPCNonceOracle(agent_roles['ALICE'], eth_rpc)
-    c = ERC20(signer=eth_signer, nonce_oracle=nonce_oracle, chain_id=chain_id)
+    c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
     (tx_hash_hex, o) = c.transfer(foo_token, agent_roles['ALICE'], agent_roles['BOB'], 256)
     eth_rpc.do(o)
     o = receipt(tx_hash_hex)
@@ -110,7 +114,6 @@ def test_list_tx(
     r = t.get_leaf()
     assert t.successful()
 
-
     assert len(r) == 3
     logg.debug('rrrr {}'.format(r))