refactor: Drop reth_primitives::Log (#7651)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
jn
2024-04-16 07:36:06 -07:00
committed by GitHub
parent 90b07427b9
commit 49ceeaf0cc
12 changed files with 183 additions and 185 deletions

View File

@ -4,7 +4,7 @@
#[inline]
pub fn from_primitive_log(log: reth_primitives::Log) -> reth_rpc_types::Log {
reth_rpc_types::Log {
inner: log.into(),
inner: log,
block_hash: None,
block_number: None,
block_timestamp: None,
@ -14,9 +14,3 @@ pub fn from_primitive_log(log: reth_primitives::Log) -> reth_rpc_types::Log {
removed: false,
}
}
/// Converts from a [reth_rpc_types::Log] to a [reth_primitives::Log]
#[inline]
pub fn to_primitive_log(log: reth_rpc_types::Log) -> reth_primitives::Log {
log.inner.into()
}

View File

@ -1707,7 +1707,7 @@ pub(crate) fn build_transaction_receipt_with_block_receipts(
let mut logs = Vec::with_capacity(receipt.logs.len());
for (tx_log_idx, log) in receipt.logs.into_iter().enumerate() {
let rpclog = Log {
inner: log.into(),
inner: log,
block_hash: Some(meta.block_hash),
block_number: Some(meta.block_number),
block_timestamp: Some(meta.timestamp),

View File

@ -22,7 +22,7 @@ where
for log in receipt.logs.iter() {
if log_matches_filter(block_num_hash, log, filter) {
let log = Log {
inner: log.clone().into(),
inner: log.clone(),
block_hash: Some(block_num_hash.hash),
block_number: Some(block_num_hash.number),
transaction_hash: Some(tx_hash),
@ -90,7 +90,7 @@ pub(crate) fn append_matching_block_logs(
}
let log = Log {
inner: log.clone().into(),
inner: log.clone(),
block_hash: Some(block_num_hash.hash),
block_number: Some(block_num_hash.number),
transaction_hash,
@ -118,7 +118,7 @@ pub(crate) fn log_matches_filter(
(!params.filter_block_range(block.number) ||
!params.filter_block_hash(block.hash) ||
!params.filter_address(&log.address) ||
!params.filter_topics(&log.topics))
!params.filter_topics(log.topics()))
{
return false
}