grassrootseconomics/cic-sync-filter
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP remove db session from filters

Browse Source
This commit is contained in:
lash
2022-04-23 09:58:17 +00:00
parent cdb26b558f
commit 38d5ca3826
17 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_bogus_filter.py
View File

@@ -40,7 +40,7 @@ def test_filter_bogus(
for fltr in fltrs:
r = None
try:
r = fltr.filter(eth_rpc, bogus_tx_block[0], bogus_tx_block[1], db_session=init_database)
r = fltr.filter(eth_rpc, bogus_tx_block[0], bogus_tx_block[1])
except:
pass
assert not r

2
tests/test_gas_filter.py
View File

@@ -106,7 +106,7 @@ def test_filter_gas(
for v in r:
logg.info('have row {}'.format(v))
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get_leaf()
assert t.successful()

4
tests/test_register_filter.py
View File

@@ -80,7 +80,7 @@ def test_register_filter(
registry = CICRegistry(default_chain_spec, eth_rpc)
queue = None
fltr = RegistrationFilter(default_chain_spec, registry, queue, caller_address=contract_roles['CONTRACT_DEPLOYER'])
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
assert t != None
t.get_leaf()
assert t.successful()
@@ -139,5 +139,5 @@ def test_register_filter_nomatch(
registry = CICRegistry(default_chain_spec, eth_rpc)
queue = None
fltr = RegistrationFilter(default_chain_spec, registry, queue, caller_address=contract_roles['CONTRACT_DEPLOYER'])
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
assert t == None

8
tests/test_straggler_filter.py
View File

@@ -96,7 +96,7 @@ def test_straggler_tx(
tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
tx = Tx(tx_src, block=block)
t = fltr.filter(None, block, tx, db_session=init_database)
t = fltr.filter(None, block, tx)
logg.debug('foo')
tx_hash_hex_successor = t.get_leaf()
logg.debug('bar')
@@ -163,7 +163,7 @@ def test_waitforgas_tx(
tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
tx = Tx(tx_src, block=block)
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get_leaf()
assert t.successful()
@@ -181,7 +181,7 @@ def test_waitforgas_tx(
assert r['status'] == 1
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get_leaf()
assert t.successful()
@@ -201,7 +201,7 @@ def test_waitforgas_tx(
init_database.commit()
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get_leaf()
otx = get_tx_local(default_chain_spec, tx.hash, session=init_database)

6
tests/test_token_filter.py
View File

@@ -73,7 +73,7 @@ def test_filter_gas(
tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
tx = Tx(tx_src, block=block)
tx.apply_receipt(rcpt)
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
assert t.get() == None
nonce_oracle = RPCNonceOracle(contract_roles['CONTRACT_DEPLOYER'], eth_rpc)
@@ -84,7 +84,7 @@ def test_filter_gas(
r = eth_rpc.do(o)
assert r['status'] == 1
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
r = t.get_leaf()
assert t.successful()
@@ -127,4 +127,4 @@ def test_filter_unknown_contract_error(
tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
tx = Tx(tx_src)
t = fltr.filter(eth_rpc, None, tx, db_session=init_database)
t = fltr.filter(eth_rpc, None, tx)

2
tests/test_transferauth_filter.py
View File

@@ -62,7 +62,7 @@ def test_filter_transferauth(
tx = Tx(tx_src, block=block)
fltr = TransferAuthFilter(cic_registry, default_chain_spec, eth_rpc, call_address=contract_roles['CONTRACT_DEPLOYER'])
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get_leaf()
assert t.successful()

2
tests/test_tx_filter.py
View File

@@ -97,7 +97,7 @@ def test_filter_tx(
tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
tx = Tx(tx_src, block=block)
t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
t = fltr.filter(eth_rpc, block, tx)
t.get()
assert t.successful()