From 95c653cf146b08e16389524bb849cd76c7a02898 Mon Sep 17 00:00:00 2001 From: sprites0 <199826320+sprites0@users.noreply.github.com> Date: Wed, 5 Nov 2025 07:46:22 +0000 Subject: [PATCH] chore: fmt --- src/addons/mod.rs | 2 +- src/chainspec/mod.rs | 5 ++++- src/node/consensus/mod.rs | 6 +++++- src/node/evm/assembler.rs | 3 ++- src/node/migrate.rs | 4 ++-- src/node/network/block_import/service.rs | 2 +- src/node/primitives/body.rs | 19 +++++++++++-------- src/node/primitives/header.rs | 11 ++++++++--- src/node/primitives/rlp.rs | 2 +- src/node/primitives/serde_bincode_compat.rs | 5 ++++- src/pseudo_peer/service.rs | 4 ++-- 11 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/addons/mod.rs b/src/addons/mod.rs index 71e488f8d..6cfed64eb 100644 --- a/src/addons/mod.rs +++ b/src/addons/mod.rs @@ -1,5 +1,5 @@ pub mod call_forwarder; pub mod hl_node_compliance; -pub mod tx_forwarder; pub mod subscribe_fixup; +pub mod tx_forwarder; mod utils; diff --git a/src/chainspec/mod.rs b/src/chainspec/mod.rs index 19ae4bdc0..52b8a9324 100644 --- a/src/chainspec/mod.rs +++ b/src/chainspec/mod.rs @@ -1,7 +1,10 @@ pub mod hl; pub mod parser; -use crate::{hardforks::HlHardforks, node::primitives::{header::HlHeaderExtras, HlHeader}}; +use crate::{ + hardforks::HlHardforks, + node::primitives::{HlHeader, header::HlHeaderExtras}, +}; use alloy_eips::eip7840::BlobParams; use alloy_genesis::Genesis; use alloy_primitives::{Address, B256, U256}; diff --git a/src/node/consensus/mod.rs b/src/node/consensus/mod.rs index aec2d76db..38bf6c8eb 100644 --- a/src/node/consensus/mod.rs +++ b/src/node/consensus/mod.rs @@ -1,4 +1,8 @@ -use crate::{hardforks::HlHardforks, node::{primitives::HlHeader, HlNode}, HlBlock, HlBlockBody, HlPrimitives}; +use crate::{ + HlBlock, HlBlockBody, HlPrimitives, + hardforks::HlHardforks, + node::{HlNode, primitives::HlHeader}, +}; use reth::{ api::{FullNodeTypes, NodeTypes}, beacon_consensus::EthBeaconConsensus, diff --git a/src/node/evm/assembler.rs b/src/node/evm/assembler.rs index 62aee3250..ecbaeb8d4 100644 --- a/src/node/evm/assembler.rs +++ b/src/node/evm/assembler.rs @@ -1,5 +1,6 @@ use crate::{ - node::evm::config::{HlBlockExecutorFactory, HlEvmConfig}, HlBlock, HlHeader + HlBlock, HlHeader, + node::evm::config::{HlBlockExecutorFactory, HlEvmConfig}, }; use reth_evm::{ block::BlockExecutionError, diff --git a/src/node/migrate.rs b/src/node/migrate.rs index 55b289574..c8f79ac9d 100644 --- a/src/node/migrate.rs +++ b/src/node/migrate.rs @@ -270,8 +270,8 @@ impl<'a, N: HlNodeType> MigrateStaticFiles<'a, N> { let mut first = true; for (block_range, _tx_ranges) in all_static_files { - let migration_needed = self.using_old_header(block_range.start())? - || self.using_old_header(block_range.end())?; + let migration_needed = self.using_old_header(block_range.start())? || + self.using_old_header(block_range.end())?; if !migration_needed { // Create a placeholder symlink self.create_placeholder(block_range)?; diff --git a/src/node/network/block_import/service.rs b/src/node/network/block_import/service.rs index 359d9ed72..33280ffbe 100644 --- a/src/node/network/block_import/service.rs +++ b/src/node/network/block_import/service.rs @@ -179,7 +179,7 @@ where #[cfg(test)] mod tests { - use crate::{chainspec::hl::hl_mainnet, HlHeader}; + use crate::{HlHeader, chainspec::hl::hl_mainnet}; use super::*; use alloy_primitives::{B256, U128}; diff --git a/src/node/primitives/body.rs b/src/node/primitives/body.rs index abe696282..adc6cb09f 100644 --- a/src/node/primitives/body.rs +++ b/src/node/primitives/body.rs @@ -3,8 +3,13 @@ use alloy_primitives::Address; use reth_primitives_traits::{BlockBody as BlockBodyTrait, InMemorySize}; use serde::{Deserialize, Serialize}; -use crate::node::types::{ReadPrecompileCall, ReadPrecompileCalls}; -use crate::{HlHeader, node::primitives::TransactionSigned}; +use crate::{ + HlHeader, + node::{ + primitives::TransactionSigned, + types::{ReadPrecompileCall, ReadPrecompileCalls}, + }, +}; /// Block body for HL. It is equivalent to Ethereum [`BlockBody`] but additionally stores sidecars /// for blob transactions. @@ -33,13 +38,11 @@ pub type BlockBody = alloy_consensus::BlockBody; impl InMemorySize for HlBlockBody { fn size(&self) -> usize { - self.inner.size() - + self - .sidecars + self.inner.size() + + self.sidecars .as_ref() - .map_or(0, |s| s.capacity() * core::mem::size_of::()) - + self - .read_precompile_calls + .map_or(0, |s| s.capacity() * core::mem::size_of::()) + + self.read_precompile_calls .as_ref() .map_or(0, |s| s.0.capacity() * core::mem::size_of::()) } diff --git a/src/node/primitives/header.rs b/src/node/primitives/header.rs index 3734ba2e5..0b9d58516 100644 --- a/src/node/primitives/header.rs +++ b/src/node/primitives/header.rs @@ -45,7 +45,11 @@ pub struct HlHeaderExtras { } impl HlHeader { - pub(crate) fn from_ethereum_header(header: Header, receipts: &[EthereumReceipt], system_tx_count: u64) -> HlHeader { + pub(crate) fn from_ethereum_header( + header: Header, + receipts: &[EthereumReceipt], + system_tx_count: u64, + ) -> HlHeader { let logs_bloom = logs_bloom(receipts.iter().flat_map(|r| &r.logs)); HlHeader { inner: header, @@ -183,8 +187,9 @@ impl reth_codecs::Compact for HlHeader { // because Compact trait requires the Bytes field to be placed at the end of the struct. // Bytes::from_compact just reads all trailing data as the Bytes field. // - // Hence we need to use other form of serialization, since extra headers are not Compact-compatible. - // We just treat all header fields as rmp-serialized one `Bytes` field. + // Hence we need to use other form of serialization, since extra headers are not + // Compact-compatible. We just treat all header fields as rmp-serialized one `Bytes` + // field. let result: Bytes = rmp_serde::to_vec(&self).unwrap().into(); result.to_compact(buf) } diff --git a/src/node/primitives/rlp.rs b/src/node/primitives/rlp.rs index 43cdaf640..cd6124ebc 100644 --- a/src/node/primitives/rlp.rs +++ b/src/node/primitives/rlp.rs @@ -1,6 +1,6 @@ #![allow(clippy::owned_cow)] use super::{HlBlock, HlBlockBody, TransactionSigned}; -use crate::{node::types::ReadPrecompileCalls, HlHeader}; +use crate::{HlHeader, node::types::ReadPrecompileCalls}; use alloy_consensus::{BlobTransactionSidecar, BlockBody}; use alloy_eips::eip4895::Withdrawals; use alloy_primitives::Address; diff --git a/src/node/primitives/serde_bincode_compat.rs b/src/node/primitives/serde_bincode_compat.rs index 958ede8a9..fbab6ca7f 100644 --- a/src/node/primitives/serde_bincode_compat.rs +++ b/src/node/primitives/serde_bincode_compat.rs @@ -6,7 +6,10 @@ use serde::{Deserialize, Serialize}; use std::borrow::Cow; use super::{HlBlock, HlBlockBody}; -use crate::{node::{primitives::BlockBody, types::ReadPrecompileCalls}, HlHeader}; +use crate::{ + HlHeader, + node::{primitives::BlockBody, types::ReadPrecompileCalls}, +}; #[derive(Debug, Serialize, Deserialize)] pub struct HlBlockBodyBincode<'a> { diff --git a/src/pseudo_peer/service.rs b/src/pseudo_peer/service.rs index ddca88f1b..82f3efbd3 100644 --- a/src/pseudo_peer/service.rs +++ b/src/pseudo_peer/service.rs @@ -82,8 +82,8 @@ impl BlockPoller { .ok_or(eyre::eyre!("Failed to find latest block number"))?; loop { - if let Some(debug_cutoff_height) = debug_cutoff_height - && next_block_number > debug_cutoff_height + if let Some(debug_cutoff_height) = debug_cutoff_height && + next_block_number > debug_cutoff_height { next_block_number = debug_cutoff_height; }