kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reinstate skipped admin noncritical tests

Browse Source
This commit is contained in:
nolash 2021-07-21 14:13:56 +02:00
parent 135bdfe45f
commit ea0e2f89d6
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 252 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

504
apps/cic-eth/tests/task/api/test_admin_noncritical.py
View File

@ -41,83 +41,83 @@ from cic_eth.eth.erc20 import cache_transfer_data
logg = logging.getLogger() logg = logging.getLogger()
#
#def test_admin_api_tx( def test_admin_api_tx(
# default_chain_spec, default_chain_spec,
# init_database, init_database,
# init_celery_tasks, init_celery_tasks,
# eth_rpc, eth_rpc,
# eth_signer, eth_signer,
# agent_roles, agent_roles,
# contract_roles, contract_roles,
# custodial_roles, custodial_roles,
# celery_session_worker, celery_session_worker,
# foo_token, foo_token,
# address_declarator, address_declarator,
# cic_registry, cic_registry,
# register_tokens, register_tokens,
# register_lookups, register_lookups,
# caplog, caplog,
# ): ):
#
# nonce_oracle = RPCNonceOracle(custodial_roles['FOO_TOKEN_GIFTER'], conn=eth_rpc) nonce_oracle = RPCNonceOracle(custodial_roles['FOO_TOKEN_GIFTER'], conn=eth_rpc)
# gas_oracle = OverrideGasOracle(limit=100000, conn=eth_rpc) gas_oracle = OverrideGasOracle(limit=100000, conn=eth_rpc)
#
# o = nonce(custodial_roles['FOO_TOKEN_GIFTER']) o = nonce(custodial_roles['FOO_TOKEN_GIFTER'])
# r = eth_rpc.do(o) r = eth_rpc.do(o)
# gifter_nonce = int(r, 16) gifter_nonce = int(r, 16)
#
# #c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) #c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
# c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
# (tx_hash_hex, tx_signed_raw_hex) = c.transfer(foo_token, custodial_roles['FOO_TOKEN_GIFTER'], agent_roles['ALICE'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED) (tx_hash_hex, tx_signed_raw_hex) = c.transfer(foo_token, custodial_roles['FOO_TOKEN_GIFTER'], agent_roles['ALICE'], 100 * (10 ** 6), tx_format=TxFormat.RLP_SIGNED)
# queue_create( queue_create(
# default_chain_spec, default_chain_spec,
# gifter_nonce, # will only work if agent starts at 0 gifter_nonce, # will only work if agent starts at 0
# agent_roles['ALICE'], agent_roles['ALICE'],
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# session=init_database, session=init_database,
# ) )
# cache_transfer_data( cache_transfer_data(
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# default_chain_spec.asdict(), default_chain_spec.asdict(),
# ) )
#
# init_database.commit() init_database.commit()
#
# o = raw(tx_signed_raw_hex) o = raw(tx_signed_raw_hex)
# eth_rpc.do(o) eth_rpc.do(o)
#
# o = receipt(tx_hash_hex) o = receipt(tx_hash_hex)
# r = eth_rpc.do(o) r = eth_rpc.do(o)
# assert r['status'] == 1 assert r['status'] == 1
#
# set_ready(default_chain_spec, tx_hash_hex, session=init_database) set_ready(default_chain_spec, tx_hash_hex, session=init_database)
# set_reserved(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) set_sent(default_chain_spec, tx_hash_hex, session=init_database)
#
# # lookup by transaction hash, without registry # lookup by transaction hash, without registry
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# tx = api.tx(default_chain_spec, tx_hash=tx_hash_hex) tx = api.tx(default_chain_spec, tx_hash=tx_hash_hex)
# logg.debug('deployed {}'.format(contract_roles['CONTRACT_DEPLOYER'])) logg.debug('deployed {}'.format(contract_roles['CONTRACT_DEPLOYER']))
# assert tx['tx_hash'] == tx_hash_hex assert tx['tx_hash'] == tx_hash_hex
#
# # lookup by RLP transaction, without registry # lookup by RLP transaction, without registry
# tx = api.tx(default_chain_spec, tx_raw=tx_signed_raw_hex) tx = api.tx(default_chain_spec, tx_raw=tx_signed_raw_hex)
# assert tx['tx_hash'] == tx_hash_hex assert tx['tx_hash'] == tx_hash_hex
#
# # lookup by transaction hash, with registry # lookup by transaction hash, with registry
# registry = CICRegistry(default_chain_spec, eth_rpc) registry = CICRegistry(default_chain_spec, eth_rpc)
# tx = api.tx(default_chain_spec, tx_hash=tx_hash_hex, registry=registry) tx = api.tx(default_chain_spec, tx_hash=tx_hash_hex, registry=registry)
# assert tx['tx_hash'] == tx_hash_hex assert tx['tx_hash'] == tx_hash_hex
#
# # lookup by transaction hash, using writer # lookup by transaction hash, using writer
# buf = io.StringIO() buf = io.StringIO()
# api.tx(default_chain_spec, tx_hash=tx_hash_hex, renderer=json.dumps, w=buf) api.tx(default_chain_spec, tx_hash=tx_hash_hex, renderer=json.dumps, w=buf)
# tx = json.loads(buf.getvalue()) tx = json.loads(buf.getvalue())
# assert tx['tx_hash'] == tx_hash_hex assert tx['tx_hash'] == tx_hash_hex
#
def test_admin_api_account( def test_admin_api_account(
default_chain_spec, default_chain_spec,
@ -196,178 +196,178 @@ def test_admin_api_account(
assert len(r) == 3 assert len(r) == 3
#def test_admin_api_account_writer( def test_admin_api_account_writer(
# default_chain_spec, default_chain_spec,
# init_database, init_database,
# eth_rpc, eth_rpc,
# eth_signer, eth_signer,
# agent_roles, agent_roles,
# contract_roles, contract_roles,
# celery_session_worker, celery_session_worker,
# caplog, caplog,
# ): ):
#
# nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42) nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42)
# gas_oracle = OverrideGasOracle(limit=21000, conn=eth_rpc) gas_oracle = OverrideGasOracle(limit=21000, conn=eth_rpc)
#
# c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) 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) (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( queue_create(
# default_chain_spec, default_chain_spec,
# 42, 42,
# agent_roles['ALICE'], agent_roles['ALICE'],
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# session=init_database, session=init_database,
# ) )
# cache_gas_data( cache_gas_data(
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# default_chain_spec.asdict(), default_chain_spec.asdict(),
# ) )
#
# init_database.commit() init_database.commit()
#
# buf = io.StringIO() buf = io.StringIO()
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# api.account(default_chain_spec, agent_roles['ALICE'], renderer=json.dumps, w=buf) api.account(default_chain_spec, agent_roles['ALICE'], renderer=json.dumps, w=buf)
#
# # TODO: improve eval # TODO: improve eval
# tx = json.loads(buf.getvalue()) tx = json.loads(buf.getvalue())
# assert tx['tx_hash'] == tx_hash_hex assert tx['tx_hash'] == tx_hash_hex
#
#
#def test_registry( def test_registry(
# eth_rpc, eth_rpc,
# cic_registry, cic_registry,
# contract_roles, contract_roles,
# celery_session_worker, celery_session_worker,
# ): ):
#
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# t = api.registry() t = api.registry()
# r = t.get_leaf() r = t.get_leaf()
# assert r == cic_registry assert r == cic_registry
#
#
#def test_proxy_do( def test_proxy_do(
# default_chain_spec, default_chain_spec,
# eth_rpc, eth_rpc,
# contract_roles, contract_roles,
# celery_session_worker, celery_session_worker,
# ): ):
#
# o = block_latest() o = block_latest()
# r = eth_rpc.do(o) r = eth_rpc.do(o)
#
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# t = api.proxy_do(default_chain_spec, o) t = api.proxy_do(default_chain_spec, o)
# rr = t.get_leaf() rr = t.get_leaf()
#
# assert r == rr assert r == rr
#
#
#def test_resend_inplace( def test_resend_inplace(
# init_database, init_database,
# default_chain_spec, default_chain_spec,
# eth_rpc, eth_rpc,
# eth_signer, eth_signer,
# agent_roles, agent_roles,
# contract_roles, contract_roles,
# celery_session_worker, celery_session_worker,
# ): ):
#
# rpc = RPCConnection.connect(default_chain_spec, 'default') rpc = RPCConnection.connect(default_chain_spec, 'default')
# nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42) nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42)
# gas_oracle = OverrideGasOracle(price=1000000000, limit=21000) gas_oracle = OverrideGasOracle(price=1000000000, limit=21000)
# c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) 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) (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( queue_create(
# default_chain_spec, default_chain_spec,
# 42, 42,
# agent_roles['ALICE'], agent_roles['ALICE'],
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# session=init_database, session=init_database,
# ) )
# cache_gas_data( cache_gas_data(
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# default_chain_spec.asdict(), default_chain_spec.asdict(),
# ) )
#
# set_ready(default_chain_spec, tx_hash_hex, session=init_database) set_ready(default_chain_spec, tx_hash_hex, session=init_database)
# set_reserved(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) set_sent(default_chain_spec, tx_hash_hex, session=init_database)
#
# init_database.commit() init_database.commit()
#
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# t = api.resend(tx_hash_hex, default_chain_spec, unlock=True) t = api.resend(tx_hash_hex, default_chain_spec, unlock=True)
# r = t.get_leaf() r = t.get_leaf()
# assert t.successful() assert t.successful()
#
#
# otx = Otx.load(tx_hash_hex, session=init_database) otx = Otx.load(tx_hash_hex, session=init_database)
# assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE
#
# txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database) txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
# assert len(txs) == 2 assert len(txs) == 2
#
#
#
#@pytest.mark.xfail() @pytest.mark.xfail()
#def test_resend_clone( def test_resend_clone(
# init_database, init_database,
# default_chain_spec, default_chain_spec,
# eth_rpc, eth_rpc,
# eth_signer, eth_signer,
# agent_roles, agent_roles,
# contract_roles, contract_roles,
# celery_session_worker, celery_session_worker,
# ): ):
#
# rpc = RPCConnection.connect(default_chain_spec, 'default') rpc = RPCConnection.connect(default_chain_spec, 'default')
# nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42) nonce_oracle = OverrideNonceOracle(agent_roles['ALICE'], 42)
# gas_oracle = OverrideGasOracle(price=1000000000, limit=21000) gas_oracle = OverrideGasOracle(price=1000000000, limit=21000)
# c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle) 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) (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( queue_create(
# default_chain_spec, default_chain_spec,
# 42, 42,
# agent_roles['ALICE'], agent_roles['ALICE'],
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# session=init_database, session=init_database,
# ) )
# cache_gas_data( cache_gas_data(
# tx_hash_hex, tx_hash_hex,
# tx_signed_raw_hex, tx_signed_raw_hex,
# default_chain_spec.asdict(), default_chain_spec.asdict(),
# ) )
#
# set_ready(default_chain_spec, tx_hash_hex, session=init_database) set_ready(default_chain_spec, tx_hash_hex, session=init_database)
# set_reserved(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) set_sent(default_chain_spec, tx_hash_hex, session=init_database)
#
# init_database.commit() init_database.commit()
#
# api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER']) api = AdminApi(eth_rpc, queue=None, call_address=contract_roles['CONTRACT_DEPLOYER'])
# t = api.resend(tx_hash_hex, default_chain_spec, in_place=False) t = api.resend(tx_hash_hex, default_chain_spec, in_place=False)
# r = t.get_leaf() r = t.get_leaf()
# assert t.successful() assert t.successful()
#
# otx = Otx.load(tx_hash_hex, session=init_database) otx = Otx.load(tx_hash_hex, session=init_database)
# assert otx.status & StatusBits.IN_NETWORK == StatusBits.IN_NETWORK assert otx.status & StatusBits.IN_NETWORK == StatusBits.IN_NETWORK
# assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE
#
# txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database) txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
# assert len(txs) == 1 assert len(txs) == 1
#
# txs = get_nonce_tx_cache(default_chain_spec, otx.nonce + 1, agent_roles['ALICE'], session=init_database) txs = get_nonce_tx_cache(default_chain_spec, otx.nonce + 1, agent_roles['ALICE'], session=init_database)
# assert len(txs) == 1 assert len(txs) == 1
#
# otx = Otx.load(txs[0], session=init_database) otx = Otx.load(txs[0], session=init_database)
# assert otx.status == 0 assert otx.status == 0