From d208ebb473adcb2e104c583d8ab3866321b2aa22 Mon Sep 17 00:00:00 2001 From: nolash Date: Sun, 18 Jul 2021 12:02:14 +0200 Subject: [PATCH] Add dispatch tests --- chaind_eth/dispatch.py | 26 +++++++++++++++++++++----- chainqueue/adapters/eth.py | 14 +++++++++++--- tests/chaind_eth_base.py | 22 +++++++++++++++++++++- tests/test_adapter.py | 27 ++++----------------------- tests/test_dispatch.py | 34 ++++++++++++++++++++++++++++++++++ tests/test_filter.py | 2 +- 6 files changed, 92 insertions(+), 33 deletions(-) create mode 100644 tests/test_dispatch.py diff --git a/chaind_eth/dispatch.py b/chaind_eth/dispatch.py index 71e68cc..79db16c 100644 --- a/chaind_eth/dispatch.py +++ b/chaind_eth/dispatch.py @@ -8,12 +8,14 @@ from chainqueue.enum import StatusBits from chainqueue.sql.query import count_tx from hexathon import strip_0x -logg = logging.getLogger(__name__) +#logg = logging.getLogger(__name__) +logg = logging.getLogger() class Dispatcher: status_inflight_mask = StatusBits.IN_NETWORK | StatusBits.FINAL + status_inflight_mask_match = StatusBits.IN_NETWORK def __init__(self, chain_spec, adapter, limit=100): self.address_counts = {} @@ -22,16 +24,25 @@ class Dispatcher: self.limit = limit - def get_count(self, address, session): + def __init_count(self, address, session): c = self.address_counts.get(address) if c == None: - c = self.limit - count_tx(self.chain_spec, address, self.status_inflight_mask, StatusBits.IN_NETWORK, session=session) + c = self.limit - count_tx(self.chain_spec, address, self.status_inflight_mask, self.status_inflight_mask_match, session=session) if c < 0: c = 0 self.address_counts[address] = c return c + def get_count(self, address, session): + return self.__init_count(address, session) + + + def inc_count(self, address, session): + self.__init_count(address, session) + self.address_counts[address] -= 1 + + def process(self, rpc, session): c = 0 txs = self.adapter.upcoming(self.chain_spec, session=session) @@ -43,7 +54,12 @@ class Dispatcher: if address_count == 0: logg.debug('too many inflight txs for {}, skipping {}'.format(sender, k)) continue - logg.debug('txs {} {}'.format(k, txs[k])) - self.adapter.dispatch(self.chain_spec, rpc, k, txs[k], session) + logg.debug('processing tx {} {}'.format(k, txs[k])) + try: + self.adapter.dispatch(self.chain_spec, rpc, k, txs[k], session) + except JSONRPCException as e: + logg.error('dispatch failed for {}: {}'.format(k, e)) + continue + self.inc_count(sender, session) c += 1 return c diff --git a/chainqueue/adapters/eth.py b/chainqueue/adapters/eth.py index f716924..0ca5b02 100644 --- a/chainqueue/adapters/eth.py +++ b/chainqueue/adapters/eth.py @@ -1,3 +1,6 @@ +# standard imports +import logging + # external imports from chainlib.eth.constant import ZERO_ADDRESS from chainlib.eth.tx import ( @@ -8,14 +11,19 @@ from hexathon import ( add_0x, strip_0x, ) +from chainqueue.enum import StatusBits # local imports from chainqueue.adapters.base import Adapter +#logg = logging.getLogger(__name__) +logg = logging.getLogger() + class EthAdapter(Adapter): - def translate(self, chain_spec, bytecode): + def translate(self, bytecode, chain_spec): + logg.debug('bytecode {}'.format(bytecode)) tx = unpack(bytecode, chain_spec) tx['source_token'] = ZERO_ADDRESS tx['destination_token'] = ZERO_ADDRESS @@ -34,8 +42,8 @@ class EthAdapter(Adapter): return self.backend.get(chain_spec, StatusBits.QUEUED, self.translate) # possible maldesign, up-stack should use our session? - def add(self, chain_spec, bytecode, session=None): - tx = self.translate(chain_spec, bytecode) + def add(self, bytecode, chain_spec, session=None): + tx = self.translate(bytecode, chain_spec) r = self.backend.create(chain_spec, tx['nonce'], tx['from'], tx['hash'], add_0x(bytecode.hex()), session=session) if r: session.rollback() diff --git a/tests/chaind_eth_base.py b/tests/chaind_eth_base.py index e83cd0d..c38e52b 100644 --- a/tests/chaind_eth_base.py +++ b/tests/chaind_eth_base.py @@ -1,15 +1,23 @@ # standard imports +import os import unittest # external imports from chainsyncer.unittest.db import ChainSyncerDb from chainqueue.unittest.db import ChainQueueDb from chainlib.eth.unittest.ethtester import EthTesterCase +from chainqueue.adapters.eth import EthAdapter +from chainqueue.unittest.db import ( + db_config, + dsn_from_config, + ) +from chainqueue.sql.backend import SQLBackend +from chainlib.eth.address import to_checksum_address +from hexathon import add_0x # local imports from chaind_eth.chain import EthChainInterface - class TestBase(EthTesterCase): def setUp(self): @@ -28,3 +36,15 @@ class TestBase(EthTesterCase): self.session_chainqueue.commit() self.db_chainqueue.release_session(self.session_chainqueue) super(TestBase, self).tearDown() + + +class TestSQLBase(TestBase): + + example_tx = bytes.fromhex('f8650d8405f5e10082520894ee38d3a40e177608d41978778206831f60dd0fa88204008077a040adee2ad0a0e566bced4b76a8899549e86719eb8866b87674b6fdc88479c201a030b3ca061bb330f4d78bc9cb8144c8e570339496f56b7809387de2ffeaa585d5') + example_tx_sender = add_0x(to_checksum_address('eb3907ecad74a0013c259d5874ae7f22dcbcc95c')) + dsn = dsn_from_config(db_config) + + def setUp(self): + super(TestSQLBase, self).setUp() + self.backend = SQLBackend(self.dsn, debug=bool(os.environ.get('DATABASE_DEBUG'))) + self.adapter = EthAdapter(self.backend) diff --git a/tests/test_adapter.py b/tests/test_adapter.py index fe50fd0..897c12e 100644 --- a/tests/test_adapter.py +++ b/tests/test_adapter.py @@ -1,44 +1,25 @@ # stanndard imports import logging import unittest -import os # external imports -from chainqueue.sql.backend import SQLBackend from chainlib.chain import ChainSpec -from chainqueue.unittest.db import ( - db_config, - dsn_from_config, - ) - -# local imports -from chainqueue.adapters.eth import EthAdapter # test imports -from tests.chaind_eth_base import TestBase +from tests.chaind_eth_base import TestSQLBase logging.basicConfig(level=logging.DEBUG) -class TestAdapter(TestBase): - - example_tx = bytes.fromhex('f8640183989680825208948311ad69b3429400ab795d45af85d204f73329ae8204d38026a097a7fd66548e4c116270b547ac7ed8cb531b0b97f80d49b45986144e47dbe44da07cc4345741dc0fabf65a473c0d3a1536cd501961f7e01b07dd8e107ff87d1556') - dsn = dsn_from_config(db_config) - - def setUp(self): - super(TestAdapter, self).setUp() - self.chain_spec = ChainSpec.from_chain_str('foo:bar:1:baz') - self.backend = SQLBackend(self.dsn, debug=bool(os.environ.get('DATABASE_DEBUG'))) - self.adapter = EthAdapter(self.backend) - +class TestAdapter(TestSQLBase): def test_eth_adapter_translate(self): - self.adapter.translate(self.chain_spec, self.example_tx) + self.adapter.translate(self.example_tx, self.chain_spec) # succesful decode means translate is working, no further checks needed def test_eth_adapter_add(self): - self.adapter.add(self.chain_spec, self.example_tx, session=self.session_chainqueue) + self.adapter.add(self.example_tx, self.chain_spec, session=self.session_chainqueue) if __name__ == '__main__': diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py new file mode 100644 index 0000000..f11af3e --- /dev/null +++ b/tests/test_dispatch.py @@ -0,0 +1,34 @@ +# stanndard imports +import logging +import unittest + +# external imports +from chainlib.eth.tx import unpack +from chainqueue.sql.query import get_tx +from chainqueue.enum import StatusBits + +# local imports +from chaind_eth.dispatch import Dispatcher + +# test imports +from tests.chaind_eth_base import TestSQLBase + +logging.basicConfig(level=logging.DEBUG) + + + +class TestDispatcher(TestSQLBase): + + def test_dispatch_process(self): + dispatcher = Dispatcher(self.chain_spec, self.adapter, 1) + self.adapter.add(self.example_tx, self.chain_spec, session=self.session_chainqueue) + assert dispatcher.get_count(self.example_tx_sender, self.session_chainqueue) == 1 + dispatcher.process(self.rpc, self.session_chainqueue) + tx_obj = unpack(self.example_tx, self.chain_spec) + o = get_tx(self.chain_spec, tx_obj['hash'], session=self.session_chainqueue) + assert o['status'] & StatusBits.IN_NETWORK > 0 + + assert dispatcher.get_count(self.example_tx_sender, self.session_chainqueue) == 0 + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_filter.py b/tests/test_filter.py index a78de29..90c6d9f 100644 --- a/tests/test_filter.py +++ b/tests/test_filter.py @@ -76,7 +76,7 @@ class TestFilter(TestBase): adapter = EthAdapter(backend) tx_raw_rlp_signed_bytes = bytes.fromhex(strip_0x(tx_raw_rlp_signed)) - adapter.add(self.chain_spec, tx_raw_rlp_signed_bytes, session=self.session_chainqueue) + adapter.add(tx_raw_rlp_signed_bytes, self.chain_spec, session=self.session_chainqueue) set_ready(self.chain_spec, tx_hash, session=self.session_chainqueue) set_reserved(self.chain_spec, tx_hash, session=self.session_chainqueue)