From 906c7f17d00ec399ac21df1e9ecd1e1eea9f162c Mon Sep 17 00:00:00 2001 From: nolash Date: Fri, 5 Mar 2021 20:33:05 +0100 Subject: [PATCH] WIP rehabilitating tests after nonce task change --- apps/cic-eth/tests/fixtures_web3.py | 11 ++-- apps/cic-eth/tests/functional/test_admin.py | 29 +++++++++-- apps/cic-eth/tests/functional/test_app.py | 24 +-------- apps/cic-eth/tests/functional/test_list.py | 33 ++++++++++-- apps/cic-eth/tests/tasks/test_account.py | 4 -- .../tests/tasks/test_balance_complex.py | 8 ++- apps/cic-eth/tests/tasks/test_convert.py | 4 ++ apps/cic-eth/tests/tasks/test_faucet.py | 5 -- apps/cic-eth/tests/tasks/test_gas_tasks.py | 19 +++---- apps/cic-eth/tests/tasks/test_nonce_tasks.py | 6 ++- apps/cic-eth/tests/tasks/test_token_tasks.py | 21 +++++--- apps/cic-eth/tests/unit/eth/test_bancor.py | 3 ++ apps/cic-eth/tests/unit/eth/test_nonce.py | 51 ------------------- apps/cic-eth/tests/unit/eth/test_token.py | 10 ++++ apps/cic-eth/tests/unit/ext/test_ext_tx.py | 25 ++++++++- 15 files changed, 140 insertions(+), 113 deletions(-) delete mode 100644 apps/cic-eth/tests/unit/eth/test_nonce.py diff --git a/apps/cic-eth/tests/fixtures_web3.py b/apps/cic-eth/tests/fixtures_web3.py index 406655b8..4fe2a29d 100644 --- a/apps/cic-eth/tests/fixtures_web3.py +++ b/apps/cic-eth/tests/fixtures_web3.py @@ -114,11 +114,17 @@ def init_w3_conn( @pytest.fixture(scope='function') def init_w3( + init_database, init_eth_tester, init_eth_account_roles, init_w3_conn, ): + for address in init_w3_conn.eth.accounts: + nonce = init_w3_conn.eth.getTransactionCount(address, 'pending') + Nonce.init(address, nonce=nonce, session=init_database) + init_database.commit() + yield init_w3_conn logg.debug('mining om nom nom... {}'.format(init_eth_tester.mine_block())) @@ -132,8 +138,7 @@ def init_eth_account_roles( address = w3_account_roles.get('eth_account_gas_provider') role = AccountRole.set('GAS_GIFTER', address) init_database.add(role) - Nonce.init(address, session=init_database) - init_database.commit() + return w3_account_roles @@ -166,7 +171,6 @@ def w3_account_roles( role_ids = [ 'eth_account_bancor_deployer', - 'eth_account_gas_provider', 'eth_account_reserve_owner', 'eth_account_reserve_minter', 'eth_account_accounts_index_owner', @@ -175,6 +179,7 @@ def w3_account_roles( 'eth_account_sarafu_gifter', 'eth_account_approval_owner', 'eth_account_faucet_owner', + 'eth_account_gas_provider', ] roles = {} diff --git a/apps/cic-eth/tests/functional/test_admin.py b/apps/cic-eth/tests/functional/test_admin.py index 2b55420b..b7665745 100644 --- a/apps/cic-eth/tests/functional/test_admin.py +++ b/apps/cic-eth/tests/functional/test_admin.py @@ -10,6 +10,8 @@ import web3 # 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, @@ -39,18 +41,37 @@ def test_resend_inplace( c = RpcClient(default_chain_spec) sigs = [] - s = celery.signature( - 'cic_eth.eth.tx.refill_gas', + + gas_provider = c.gas_provider() + + s_nonce = celery.signature( + 'cic_eth.eth.tx.reserve_nonce', [ init_w3.eth.accounts[0], + gas_provider, + ], + queue=None, + ) + s_refill = celery.signature( + 'cic_eth.eth.tx.refill_gas', + [ chain_str, ], queue=None, ) - t = s.apply_async() - tx_raw = t.get() + s_nonce.link(s_refill) + t = s_nonce.apply_async() + t.get() + for r in t.collect(): + pass assert t.successful() + q = init_database.query(Otx) + q = q.join(TxCache) + q = q.filter(TxCache.recipient==init_w3.eth.accounts[0]) + o = q.first() + tx_raw = o.signed_tx + tx_dict = unpack_signed_raw_tx(bytes.fromhex(tx_raw[2:]), default_chain_spec.chain_id()) gas_price_before = tx_dict['gasPrice'] diff --git a/apps/cic-eth/tests/functional/test_app.py b/apps/cic-eth/tests/functional/test_app.py index ff9a65ce..440b007d 100644 --- a/apps/cic-eth/tests/functional/test_app.py +++ b/apps/cic-eth/tests/functional/test_app.py @@ -49,28 +49,7 @@ def test_transfer_api( assert t.successful() -def test_transfer_approval_api( - default_chain_spec, - init_w3, - cic_registry, - init_database, - bancor_registry, - bancor_tokens, - transfer_approval, - celery_session_worker, - ): - - token = CICRegistry.get_address(default_chain_spec, bancor_tokens[0]) - approval_contract = CICRegistry.get_contract(default_chain_spec, 'TransferApproval') - - api = Api(str(default_chain_spec), callback_param='transfer_request', callback_task='cic_eth.callbacks.noop.noop', queue=None) - t = api.transfer_request(init_w3.eth.accounts[2], init_w3.eth.accounts[4], approval_contract.address(), 111, token.symbol()) - t.get() - #for r in t.collect(): - # print(r) - assert t.successful() - - +@pytest.mark.skip() def test_convert_api( default_chain_spec, init_w3, @@ -91,6 +70,7 @@ def test_convert_api( assert t.successful() +@pytest.mark.skip() def test_convert_transfer_api( default_chain_spec, init_w3, diff --git a/apps/cic-eth/tests/functional/test_list.py b/apps/cic-eth/tests/functional/test_list.py index b104f977..8e46dc12 100644 --- a/apps/cic-eth/tests/functional/test_list.py +++ b/apps/cic-eth/tests/functional/test_list.py @@ -9,6 +9,10 @@ from tests.mock.filter import ( block_filter, tx_filter, ) +from cic_eth.db.models.nonce import ( + Nonce, + NonceReservation, + ) logg = logging.getLogger() @@ -28,9 +32,20 @@ def test_list_tx( tx_hashes = [] # external tx + nonce = init_w3.eth.getTransactionCount(init_w3.eth.accounts[0]) + q = init_database.query(Nonce) + q = q.filter(Nonce.address_hex==init_w3.eth.accounts[0]) + o = q.first() + o.nonce = nonce + init_database.add(o) + init_database.commit() + + NonceReservation.next(init_w3.eth.accounts[0], 'foo', session=init_database) + init_database.commit() + init_eth_tester.mine_blocks(13) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) - tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 3000, default_chain_spec) + tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 3000, default_chain_spec, 'foo') (tx_hash_hex, tx_signed_raw_hex) = sign_tx(tx, str(default_chain_spec)) tx_hashes.append(tx_hash_hex) init_w3.eth.sendRawTransaction(tx_signed_raw_hex) @@ -42,9 +57,12 @@ def test_list_tx( tx_filter.add(a.to_bytes(4, 'big')) # external tx + NonceReservation.next(init_w3.eth.accounts[0], 'bar', session=init_database) + init_database.commit() + init_eth_tester.mine_blocks(28) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) - tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 4000, default_chain_spec) + tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 4000, default_chain_spec, 'bar') (tx_hash_hex, tx_signed_raw_hex) = sign_tx(tx, str(default_chain_spec)) tx_hashes.append(tx_hash_hex) init_w3.eth.sendRawTransaction(tx_signed_raw_hex) @@ -56,10 +74,13 @@ def test_list_tx( tx_filter.add(a.to_bytes(4, 'big')) # custodial tx + #NonceReservation.next(init_w3.eth.accounts[0], 'blinky', session=init_database) + #init_database.commit() + init_eth_tester.mine_blocks(3) - txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) + #txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) api = Api(str(default_chain_spec), queue=None) - t = api.transfer(init_w3.eth.accounts[0], init_w3.eth.accounts[1], 1000, 'DUM') + t = api.transfer(init_w3.eth.accounts[0], init_w3.eth.accounts[1], 1000, 'DUM') #, 'blinky') t.get() tx_hash_hex = None for c in t.collect(): @@ -68,9 +89,11 @@ def test_list_tx( tx_hashes.append(tx_hash_hex) # custodial tx + #NonceReservation.next(init_w3.eth.accounts[0], 'clyde', session=init_database) + init_database.commit() init_eth_tester.mine_blocks(6) api = Api(str(default_chain_spec), queue=None) - t = api.transfer(init_w3.eth.accounts[0], init_w3.eth.accounts[1], 2000, 'DUM') + t = api.transfer(init_w3.eth.accounts[0], init_w3.eth.accounts[1], 2000, 'DUM') #, 'clyde') t.get() tx_hash_hex = None for c in t.collect(): diff --git a/apps/cic-eth/tests/tasks/test_account.py b/apps/cic-eth/tests/tasks/test_account.py index 78cd8314..a14b5add 100644 --- a/apps/cic-eth/tests/tasks/test_account.py +++ b/apps/cic-eth/tests/tasks/test_account.py @@ -72,10 +72,6 @@ def test_register_account( logg.debug('chainspec {}'.format(str(default_chain_spec))) - nonce = init_w3.eth.getTransactionCount(init_w3.eth.accounts[0]) - Nonce.init(init_w3.eth.accounts[0], nonce, session=init_database) - init_database.commit() - s_nonce = celery.signature( 'cic_eth.eth.tx.reserve_nonce', [ diff --git a/apps/cic-eth/tests/tasks/test_balance_complex.py b/apps/cic-eth/tests/tasks/test_balance_complex.py index 8da6f51e..162d5fa5 100644 --- a/apps/cic-eth/tests/tasks/test_balance_complex.py +++ b/apps/cic-eth/tests/tasks/test_balance_complex.py @@ -33,8 +33,14 @@ def test_balance_complex( tx_hashes = [] + # TODO: Temporary workaround for nonce db cache initialization being made before deployments. + # Instead use different accounts than system ones for transfers for tests nonce = init_w3.eth.getTransactionCount(init_w3.eth.accounts[0]) - Nonce.init(init_w3.eth.accounts[0], nonce, session=init_database) + q = init_database.query(Nonce) + q = q.filter(Nonce.address_hex==init_w3.eth.accounts[0]) + o = q.first() + o.nonce = nonce + init_database.add(o) init_database.commit() for i in range(3): diff --git a/apps/cic-eth/tests/tasks/test_convert.py b/apps/cic-eth/tests/tasks/test_convert.py index e142b989..e02a2111 100644 --- a/apps/cic-eth/tests/tasks/test_convert.py +++ b/apps/cic-eth/tests/tasks/test_convert.py @@ -1,8 +1,12 @@ +# standard imports import logging import os +# external imports +import pytest import celery +# local imports from cic_eth.db import TxConvertTransfer from cic_eth.eth.bancor import BancorTxFactory diff --git a/apps/cic-eth/tests/tasks/test_faucet.py b/apps/cic-eth/tests/tasks/test_faucet.py index bcf94e0e..6de48c8a 100644 --- a/apps/cic-eth/tests/tasks/test_faucet.py +++ b/apps/cic-eth/tests/tasks/test_faucet.py @@ -35,15 +35,10 @@ def test_faucet( init_database, ): - nonce = init_w3.eth.getTransactionCount(init_w3.eth.accounts[7]) - Nonce.init(init_w3.eth.accounts[7], nonce, session=init_database) - init_database.commit() - s_nonce = celery.signature( 'cic_eth.eth.tx.reserve_nonce', [ init_w3.eth.accounts[7], - init_w3.eth.accounts[0], ], queue=None, ) diff --git a/apps/cic-eth/tests/tasks/test_gas_tasks.py b/apps/cic-eth/tests/tasks/test_gas_tasks.py index 1a318d84..204daade 100644 --- a/apps/cic-eth/tests/tasks/test_gas_tasks.py +++ b/apps/cic-eth/tests/tasks/test_gas_tasks.py @@ -30,6 +30,7 @@ def test_refill_gas( default_chain_spec, init_eth_tester, init_rpc, + init_w3, init_database, cic_registry, init_eth_account_roles, @@ -47,7 +48,7 @@ def test_refill_gas( s_nonce = celery.signature( 'cic_eth.eth.tx.reserve_nonce', [ - receiver_address, + eth_empty_accounts[0], provider_address, ], queue=None, @@ -90,11 +91,11 @@ def test_refill_gas( assert balance_new == (balance + refill_amount) # Verify that entry is added in TxCache - session = SessionBase.create_session() - q = session.query(Otx) + q = init_database.query(Otx) q = q.join(TxCache) q = q.filter(TxCache.recipient==receiver_address) r = q.first() + init_database.commit() assert r.status == StatusEnum.SENT @@ -102,6 +103,7 @@ def test_refill_gas( def test_refill_deduplication( default_chain_spec, init_rpc, + init_w3, init_database, init_eth_account_roles, cic_registry, @@ -256,16 +258,14 @@ def test_resend_with_higher_gas( c = init_rpc - token_data = [ - { - 'address': bancor_tokens[0], - }, - ] + token_data = { + 'address': bancor_tokens[0], + } s_nonce = celery.signature( 'cic_eth.eth.tx.reserve_nonce', [ - token_data, + [token_data], init_w3.eth.accounts[0], ], queue=None, @@ -318,6 +318,7 @@ def test_resend_with_higher_gas( tx_hash_hex, str(default_chain_spec), ], + queue=None, ) t = s_resend.apply_async() diff --git a/apps/cic-eth/tests/tasks/test_nonce_tasks.py b/apps/cic-eth/tests/tasks/test_nonce_tasks.py index e89292b8..75d8ff7b 100644 --- a/apps/cic-eth/tests/tasks/test_nonce_tasks.py +++ b/apps/cic-eth/tests/tasks/test_nonce_tasks.py @@ -55,7 +55,11 @@ def test_reserve_nonce_chain( ): provider_address = init_rpc.gas_provider() - Nonce.init(provider_address, 42, session=init_database) + q = init_database.query(Nonce) + q = q.filter(Nonce.address_hex==provider_address) + o = q.first() + o.nonce = 42 + init_database.add(o) init_database.commit() s_nonce = celery.signature( diff --git a/apps/cic-eth/tests/tasks/test_token_tasks.py b/apps/cic-eth/tests/tasks/test_token_tasks.py index 1c5f860d..352ff968 100644 --- a/apps/cic-eth/tests/tasks/test_token_tasks.py +++ b/apps/cic-eth/tests/tasks/test_token_tasks.py @@ -20,21 +20,30 @@ def test_approve( cic_registry, ): - s = celery.signature( - 'cic_eth.eth.token.approve', - [ - [ + token_data = [ { 'address': bancor_tokens[0], }, - ], + ] + s_nonce = celery.signature( + 'cic_eth.eth.tx.reserve_nonce', + [ + token_data, + init_rpc.w3.eth.accounts[0], + ], + queue=None, + ) + s_approve = celery.signature( + 'cic_eth.eth.token.approve', + [ init_rpc.w3.eth.accounts[0], init_rpc.w3.eth.accounts[1], 1024, str(default_chain_spec), ], ) - t = s.apply_async() + s_nonce.link(s_approve) + t = s_nonce.apply_async() t.get() for r in t.collect(): logg.debug('result {}'.format(r)) diff --git a/apps/cic-eth/tests/unit/eth/test_bancor.py b/apps/cic-eth/tests/unit/eth/test_bancor.py index 9fd8835c..da93be39 100644 --- a/apps/cic-eth/tests/unit/eth/test_bancor.py +++ b/apps/cic-eth/tests/unit/eth/test_bancor.py @@ -17,6 +17,7 @@ from cic_eth.db.models.tx import TxCache logg = logging.getLogger() +@pytest.mark.skip() def test_resolve_converters_by_tokens( cic_registry, init_w3, @@ -43,6 +44,7 @@ def test_resolve_converters_by_tokens( assert len(t['converters']) == 1 +@pytest.mark.skip() def test_unpack_convert( default_chain_spec, cic_registry, @@ -84,6 +86,7 @@ def test_unpack_convert( assert convert_data['fee'] == 0 +@pytest.mark.skip() def test_queue_cache_convert( default_chain_spec, init_w3, diff --git a/apps/cic-eth/tests/unit/eth/test_nonce.py b/apps/cic-eth/tests/unit/eth/test_nonce.py deleted file mode 100644 index 36c44c39..00000000 --- a/apps/cic-eth/tests/unit/eth/test_nonce.py +++ /dev/null @@ -1,51 +0,0 @@ -# standard imports -import logging - -# local imports -from cic_eth.eth.nonce import NonceOracle - -logg = logging.getLogger() - - -def test_nonce_sequence( - eth_empty_accounts, - init_database, - init_rpc, - ): - - account= init_rpc.w3.eth.personal.new_account('') - no = NonceOracle(account, 0) - n = no.next() - assert n == 0 - - n = no.next() - assert n == 1 - - init_rpc.w3.eth.sendTransaction({ - 'from': init_rpc.w3.eth.accounts[0], - 'to': account, - 'value': 200000000, - }) - init_rpc.w3.eth.sendTransaction({ - 'from': account, - 'to': eth_empty_accounts[0], - 'value': 100, - }) - - c = init_rpc.w3.eth.getTransactionCount(account, 'pending') - logg.debug('nonce {}'.format(c)) - - account= init_rpc.w3.eth.personal.new_account('') - no = NonceOracle(account, c) - - n = no.next() - assert n == 1 - - n = no.next() - assert n == 2 - - # try with bogus value - no = NonceOracle(account, 4) - n = no.next() - assert n == 3 - diff --git a/apps/cic-eth/tests/unit/eth/test_token.py b/apps/cic-eth/tests/unit/eth/test_token.py index c65e7190..22b48cc2 100644 --- a/apps/cic-eth/tests/unit/eth/test_token.py +++ b/apps/cic-eth/tests/unit/eth/test_token.py @@ -11,12 +11,14 @@ from cic_eth.eth.util import unpack_signed_raw_tx from cic_eth.queue.tx import create as queue_create from cic_eth.db.models.otx import Otx from cic_eth.db.models.tx import TxCache +from cic_eth.db.models.nonce import NonceReservation logg = logging.getLogger() def test_unpack_transfer( default_chain_spec, + init_database, init_w3, init_rpc, cic_registry, @@ -24,6 +26,9 @@ def test_unpack_transfer( bancor_registry, ): + NonceReservation.next(init_w3.eth.accounts[0], 'foo', init_database) + init_database.commit() + source_token = CICRegistry.get_address(default_chain_spec, bancor_tokens[0]) logg.debug('bancor tokens {} {}'.format(bancor_tokens, source_token)) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) @@ -32,6 +37,7 @@ def test_unpack_transfer( init_w3.eth.accounts[1], 42, default_chain_spec, + 'foo', ) s = init_w3.eth.sign_transaction(transfer_tx) s_bytes = bytes.fromhex(s['raw'][2:]) @@ -56,6 +62,9 @@ def test_queue_cache_transfer( bancor_registry, ): + NonceReservation.next(init_w3.eth.accounts[0], 'foo', init_database) + init_database.commit() + source_token = CICRegistry.get_address(default_chain_spec, bancor_tokens[0]) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) value = 42 @@ -64,6 +73,7 @@ def test_queue_cache_transfer( init_w3.eth.accounts[1], value, default_chain_spec, + 'foo', ) tx_signed = init_w3.eth.sign_transaction(transfer_tx) tx_hash = init_w3.eth.sendRawTransaction(tx_signed['raw']) diff --git a/apps/cic-eth/tests/unit/ext/test_ext_tx.py b/apps/cic-eth/tests/unit/ext/test_ext_tx.py index b1c50bc2..74887b91 100644 --- a/apps/cic-eth/tests/unit/ext/test_ext_tx.py +++ b/apps/cic-eth/tests/unit/ext/test_ext_tx.py @@ -8,12 +8,17 @@ import moolb # local imports from cic_eth.eth.token import TokenTxFactory from cic_eth.eth.task import sign_tx +from cic_eth.db.models.nonce import ( + NonceReservation, + Nonce, + ) logg = logging.getLogger() # TODO: This test fails when not run alone. Identify which fixture leaves a dirty state def test_filter_process( + init_database, init_rpc, default_chain_spec, default_chain_registry, @@ -29,9 +34,22 @@ def test_filter_process( tx_hashes = [] # external tx + + # TODO: it does not make sense to use the db setup for nonce here, but we need it as long as we are using the factory to assemble to tx + nonce = init_w3.eth.getTransactionCount(init_w3.eth.accounts[0]) + q = init_database.query(Nonce) + q = q.filter(Nonce.address_hex==init_w3.eth.accounts[0]) + o = q.first() + o.nonce = nonce + init_database.add(o) + init_database.commit() + + NonceReservation.next(init_w3.eth.accounts[0], 'foo', init_database) + init_database.commit() + init_eth_tester.mine_blocks(13) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) - tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 3000, default_chain_spec) + tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 3000, default_chain_spec, 'foo') (tx_hash_hex, tx_signed_raw_hex) = sign_tx(tx, str(default_chain_spec)) tx_hashes.append(tx_hash_hex) init_w3.eth.sendRawTransaction(tx_signed_raw_hex) @@ -43,9 +61,12 @@ def test_filter_process( t.add(a.to_bytes(4, 'big')) # external tx + NonceReservation.next(init_w3.eth.accounts[0], 'bar', init_database) + init_database.commit() + init_eth_tester.mine_blocks(28) txf = TokenTxFactory(init_w3.eth.accounts[0], init_rpc) - tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 4000, default_chain_spec) + tx = txf.transfer(dummy_token_gifted, init_w3.eth.accounts[1], 4000, default_chain_spec, 'bar') (tx_hash_hex, tx_signed_raw_hex) = sign_tx(tx, str(default_chain_spec)) tx_hashes.append(tx_hash_hex) init_w3.eth.sendRawTransaction(tx_signed_raw_hex)