Test remaining paths in resend gas task

apps/cic-eth/tests/task/test_task_gas.py

@@ -3,6 +3,7 @@ import logging
 
 # external imports
 import celery
+import pytest
 from chainlib.connection import RPCConnection
 from chainlib.eth.nonce import (
         OverrideNonceOracle,
@@ -13,6 +14,7 @@ from chainlib.eth.gas import (
         Gas,
         )
 from chainlib.eth.tx import (
+        unpack,
         TxFormat,
         )
 from chainlib.eth.constant import (
@@ -22,6 +24,13 @@ from chainlib.eth.constant import (
 from chainqueue.tx import create as queue_create
 from chainqueue.query import get_tx
 from chainqueue.db.enum import StatusBits
+from chainqueue.state import (
+        set_ready,
+        set_reserved,
+        set_sent,
+        )
+from chainqueue.db.models.otx import Otx
+from hexathon import strip_0x
 
 # local imports
 from cic_eth.eth.gas import cache_gas_data
@@ -30,14 +39,198 @@ from cic_eth.error import OutOfGasError
 logg = logging.getLogger()
 
 
-def test_task_check_gas_ok(
+#def test_task_check_gas_ok(
+#        default_chain_spec,
+#        eth_rpc,
+#        eth_signer,
+#        init_database,
+#        agent_roles,
+#        custodial_roles,
+#        celery_session_worker,
+#        ):
+#
+#    rpc = RPCConnection.connect(default_chain_spec, 'default')
+#    nonce_oracle = RPCNonceOracle(agent_roles['ALICE'], conn=eth_rpc) 
+#    gas_oracle = OverrideGasOracle(price=1000000000, limit=21000)
+#    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
+#    (tx_hash_hex, tx_signed_raw_hex) = c.create(agent_roles['ALICE'], agent_roles['BOB'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
+#
+#    queue_create(
+#            default_chain_spec,
+#            0,
+#            agent_roles['ALICE'],
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            session=init_database,
+#            )
+#    cache_gas_data(
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            default_chain_spec.asdict(),
+#            )
+#
+#    init_database.commit()
+#
+#    s = celery.signature(
+#            'cic_eth.eth.gas.check_gas',
+#            [
+#                [
+#                    tx_hash_hex,
+#                    ],
+#                default_chain_spec.asdict(),
+#                [],
+#                None,
+#                8000000,
+#                ],
+#            queue=None
+#            )
+#    t = s.apply_async()
+#    t.get_leaf()
+#    assert t.successful()
+#
+#    init_database.commit()
+#
+#    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
+#    assert tx['status'] & StatusBits.QUEUED == StatusBits.QUEUED
+#
+#
+#def test_task_check_gas_insufficient(
+#        default_chain_spec,
+#        eth_rpc,
+#        eth_signer,
+#        init_database,
+#        agent_roles,
+#        custodial_roles,
+#        celery_session_worker,
+#        whoever,
+#        ):
+#
+#    rpc = RPCConnection.connect(default_chain_spec, 'default')
+#    nonce_oracle = OverrideNonceOracle(whoever, 42)
+#    gas_oracle = OverrideGasOracle(price=1000000000, limit=21000)
+#    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
+#    (tx_hash_hex, tx_signed_raw_hex) = c.create(whoever, agent_roles['BOB'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
+#
+#    queue_create(
+#            default_chain_spec,
+#            42,
+#            whoever,
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            session=init_database,
+#            )
+#    cache_gas_data(
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            default_chain_spec.asdict(),
+#            )
+#
+#    init_database.commit()
+#
+#    s = celery.signature(
+#            'cic_eth.eth.gas.check_gas',
+#            [
+#                [
+#                    tx_hash_hex,
+#                    ],
+#                default_chain_spec.asdict(),
+#                [],
+#                None,
+#                None,
+#                ],
+#            queue=None
+#            )
+#    t = s.apply_async()
+#    try:
+#        r = t.get_leaf()
+#    except OutOfGasError:
+#        pass
+#
+#    init_database.commit()
+#
+#    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
+#    assert tx['status'] & StatusBits.GAS_ISSUES == StatusBits.GAS_ISSUES
+#
+#
+#def test_task_check_gas_low(
+#        default_chain_spec,
+#        eth_rpc,
+#        eth_signer,
+#        init_database,
+#        agent_roles,
+#        custodial_roles,
+#        celery_session_worker,
+#        whoever,
+#        ):
+#
+#    gas_oracle = OverrideGasOracle(price=MINIMUM_FEE_PRICE, limit=MINIMUM_FEE_UNITS)
+#    nonce_oracle = RPCNonceOracle(custodial_roles['GAS_GIFTER'], conn=eth_rpc)
+#    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
+#    (tx_hash_hex, o) = c.create(custodial_roles['GAS_GIFTER'], whoever, 100 * (10 ** 6))
+#    r = eth_rpc.do(o)
+#
+#    rpc = RPCConnection.connect(default_chain_spec, 'default')
+#    nonce_oracle = RPCNonceOracle(whoever, conn=eth_rpc) 
+#    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
+#    (tx_hash_hex, tx_signed_raw_hex) = c.create(whoever, agent_roles['BOB'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
+#
+#    queue_create(
+#            default_chain_spec,
+#            0,
+#            whoever,
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            session=init_database,
+#            )
+#    cache_gas_data(
+#            tx_hash_hex,
+#            tx_signed_raw_hex,
+#            default_chain_spec.asdict(),
+#            )
+#
+#    init_database.commit()
+#
+#    s = celery.signature(
+#            'cic_eth.eth.gas.check_gas',
+#            [
+#                [
+#                    tx_hash_hex,
+#                    ],
+#                default_chain_spec.asdict(),
+#                ],
+#                [],
+#                None,
+#                None,
+#            queue=None
+#            )
+#    t = s.apply_async()
+#    t.get_leaf()
+#    assert t.successful()
+#
+#    init_database.commit()
+#
+#    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
+#    assert tx['status'] & StatusBits.QUEUED == StatusBits.QUEUED
+
+
+@pytest.mark.parametrize(
+        '_gas_price,_gas_factor',
+        [
+        (None, 1.1),
+        (MINIMUM_FEE_PRICE * 1.1, 0.9),
+        (None, 1.3),
+        ]
+        )
+def test_task_resend_explicit(
         default_chain_spec,
+        init_database,
         eth_rpc,
         eth_signer,
-        init_database,
         agent_roles,
         custodial_roles,
         celery_session_worker,
+        _gas_price,
+        _gas_factor,
         ):
 
     rpc = RPCConnection.connect(default_chain_spec, 'default')
@@ -59,146 +252,35 @@ def test_task_check_gas_ok(
             tx_signed_raw_hex,
             default_chain_spec.asdict(),
             )
+    tx_before = unpack(bytes.fromhex(strip_0x(tx_signed_raw_hex)), default_chain_spec)
 
     init_database.commit()
 
+    set_ready(default_chain_spec, tx_hash_hex, session=init_database)
+    set_reserved(default_chain_spec, tx_hash_hex, session=init_database)
+    set_sent(default_chain_spec, tx_hash_hex, session=init_database)
+
     s = celery.signature(
-            'cic_eth.eth.gas.check_gas',
+            'cic_eth.eth.gas.resend_with_higher_gas',
             [
-                [
+                tx_hash_hex,
-                    tx_hash_hex,
-                    ],
                 default_chain_spec.asdict(),
-                [],
+                _gas_price,
-                None,
+                _gas_factor,
-                8000000,
                 ],
             queue=None
             )
     t = s.apply_async()
-    t.get_leaf()
+    r = t.get_leaf()
     assert t.successful()
 
-    init_database.commit()
+    q = init_database.query(Otx)
+    q = q.filter(Otx.tx_hash==strip_0x(r))
+    otx = q.first()
+    if otx == None:
+        raise NotLocalTxError(r)
 
-    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
+    tx_after = unpack(bytes.fromhex(strip_0x(otx.signed_tx)), default_chain_spec)
-    assert tx['status'] & StatusBits.QUEUED == StatusBits.QUEUED
+    logg.debug('gasprices before {} after {}'.format(tx_before['gasPrice'], tx_after['gasPrice']))
+    assert tx_after['gasPrice'] > tx_before['gasPrice']
 
-
-def test_task_check_gas_insufficient(
-        default_chain_spec,
-        eth_rpc,
-        eth_signer,
-        init_database,
-        agent_roles,
-        custodial_roles,
-        celery_session_worker,
-        whoever,
-        ):
-
-    rpc = RPCConnection.connect(default_chain_spec, 'default')
-    nonce_oracle = OverrideNonceOracle(whoever, 42)
-    gas_oracle = OverrideGasOracle(price=1000000000, limit=21000)
-    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-    (tx_hash_hex, tx_signed_raw_hex) = c.create(whoever, agent_roles['BOB'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
-
-    queue_create(
-            default_chain_spec,
-            42,
-            whoever,
-            tx_hash_hex,
-            tx_signed_raw_hex,
-            session=init_database,
-            )
-    cache_gas_data(
-            tx_hash_hex,
-            tx_signed_raw_hex,
-            default_chain_spec.asdict(),
-            )
-
-    init_database.commit()
-
-    s = celery.signature(
-            'cic_eth.eth.gas.check_gas',
-            [
-                [
-                    tx_hash_hex,
-                    ],
-                default_chain_spec.asdict(),
-                [],
-                None,
-                None,
-                ],
-            queue=None
-            )
-    t = s.apply_async()
-    try:
-        r = t.get_leaf()
-    except OutOfGasError:
-        pass
-
-    init_database.commit()
-
-    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
-    assert tx['status'] & StatusBits.GAS_ISSUES == StatusBits.GAS_ISSUES
-
-
-def test_task_check_gas_low(
-        default_chain_spec,
-        eth_rpc,
-        eth_signer,
-        init_database,
-        agent_roles,
-        custodial_roles,
-        celery_session_worker,
-        whoever,
-        ):
-
-    gas_oracle = OverrideGasOracle(price=MINIMUM_FEE_PRICE, limit=MINIMUM_FEE_UNITS)
-    nonce_oracle = RPCNonceOracle(custodial_roles['GAS_GIFTER'], conn=eth_rpc)
-    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-    (tx_hash_hex, o) = c.create(custodial_roles['GAS_GIFTER'], whoever, 100 * (10 ** 6))
-    r = eth_rpc.do(o)
-
-    rpc = RPCConnection.connect(default_chain_spec, 'default')
-    nonce_oracle = RPCNonceOracle(whoever, conn=eth_rpc) 
-    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-    (tx_hash_hex, tx_signed_raw_hex) = c.create(whoever, agent_roles['BOB'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
-
-    queue_create(
-            default_chain_spec,
-            0,
-            whoever,
-            tx_hash_hex,
-            tx_signed_raw_hex,
-            session=init_database,
-            )
-    cache_gas_data(
-            tx_hash_hex,
-            tx_signed_raw_hex,
-            default_chain_spec.asdict(),
-            )
-
-    init_database.commit()
-
-    s = celery.signature(
-            'cic_eth.eth.gas.check_gas',
-            [
-                [
-                    tx_hash_hex,
-                    ],
-                default_chain_spec.asdict(),
-                ],
-                [],
-                None,
-                None,
-            queue=None
-            )
-    t = s.apply_async()
-    t.get_leaf()
-    assert t.successful()
-
-    init_database.commit()
-
-    tx = get_tx(default_chain_spec, tx_hash_hex, session=init_database)
-    assert tx['status'] & StatusBits.QUEUED == StatusBits.QUEUED

apps/cic-eth/tests/task/test_task_tx.py

@@ -124,42 +124,3 @@ def test_sync_tx(
 
     o = Otx.load(tx_hash_hex, session=init_database)
     assert o.status & StatusBits.FINAL == StatusBits.FINAL
-
-
-def test_resend_with_higher_gas(
-        init_database,
-        default_chain_spec,
-        eth_rpc,
-        eth_signer,
-        agent_roles,
-        celery_session_worker,
-        ):
-
-    nonce_oracle = RPCNonceOracle(agent_roles['ALICE'], eth_rpc)
-    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)
-    register_tx(tx_hash_hex, tx_signed_raw_hex, default_chain_spec, None, session=init_database)
-    cache_gas_data(tx_hash_hex, tx_signed_raw_hex, default_chain_spec.asdict())
-    tx_before = unpack(bytes.fromhex(strip_0x(tx_signed_raw_hex)), default_chain_spec)
-
-    s = celery.signature(
-            'cic_eth.eth.gas.resend_with_higher_gas',
-            [
-                tx_hash_hex,
-                default_chain_spec.asdict(),
-                ],
-            queue=None,
-            )
-    t = s.apply_async()
-    r = t.get_leaf()
-
-    q = init_database.query(Otx)
-    q = q.filter(Otx.tx_hash==strip_0x(r))
-    otx = q.first()
-    if otx == None:
-        raise NotLocalTxError(r)
-
-    tx_after = unpack(bytes.fromhex(strip_0x(otx.signed_tx)), default_chain_spec)
-    logg.debug('gasprices before {} after {}'.format(tx_before['gasPrice'], tx_after['gasPrice']))
-    assert tx_after['gasPrice'] > tx_before['gasPrice']
-