github/ethereum-etl
1
1
Fork 0
mirror of https://github.com/blockchain-etl/ethereum-etl.git synced 2026-01-09 13:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

applied a reverse patch from 0b3f4d6 since it seems paritytech/parity-ethereum/issues/9822 was fixed

Browse Source
This commit is contained in:
Tetsuya Morimoto
2019-04-09 08:59:54 +09:00
parent 99803a772e
commit eba4e4e58e
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ethereumetl/jobs/export_traces_job.py
View File

@@ -45,8 +45,7 @@ class ExportTracesJob(BaseJob):
self.web3 = web3
# TODO: use batch_size when this issue is fixed https://github.com/paritytech/parity-ethereum/issues/9822
self.batch_work_executor = BatchWorkExecutor(1, max_workers)
self.batch_work_executor = BatchWorkExecutor(batch_size, max_workers)
self.item_exporter = item_exporter
self.trace_mapper = EthTraceMapper()
@@ -66,10 +65,12 @@ class ExportTracesJob(BaseJob):
)
def _export_batch(self, block_number_batch):
# TODO: Change to len(block_number_batch) > 0 when this issue is fixed
# https://github.com/paritytech/parity-ethereum/issues/9822
assert len(block_number_batch) == 1
block_number = block_number_batch[0]
assert len(block_number_batch) > 0
filter_params = {
'fromBlock': hex(block_number_batch[0]),
'toBlock': hex(block_number_batch[-1]),
}
if self.include_genesis_traces and 0 in block_number_batch:
genesis_traces = self.special_trace_service.get_genesis_traces()
@@ -81,9 +82,7 @@ class ExportTracesJob(BaseJob):
for trace in daofork_traces:
self.item_exporter.export_item(self.trace_mapper.trace_to_dict(trace))
# TODO: Change to traceFilter when this issue is fixed
# https://github.com/paritytech/parity-ethereum/issues/9822
json_traces = self.web3.parity.traceBlock(block_number)
json_traces = self.web3.parity.traceFilter(filter_params)
if json_traces is None:
raise ValueError('Response from the node is None. Is the node fully synced?')

4
tests/ethereumetl/job/mock_web3_provider.py
View File

@@ -35,10 +35,6 @@ class MockWeb3Provider(IPCProvider):
to = params[0]['to'].lower()
data = params[0]['data']
file_name = '{}_{}_{}.json'.format(method, to, data)
# TODO: Remove this when this issue is fixed
# https://github.com/paritytech/parity-ethereum/issues/9822
elif method == 'trace_block':
file_name = 'trace_filter.json'
else:
file_name = method + '.json'
file_content = self.read_resource(file_name)