diff --git a/crates/chainspec/src/spec.rs b/crates/chainspec/src/spec.rs index d2e15a83a..b5f5d2a12 100644 --- a/crates/chainspec/src/spec.rs +++ b/crates/chainspec/src/spec.rs @@ -296,11 +296,11 @@ impl ChainSpec { timestamp: self.genesis.timestamp, mix_hash: self.genesis.mix_hash, beneficiary: self.genesis.coinbase, - base_fee_per_gas: base_fee_per_gas.map(Into::into), + base_fee_per_gas, withdrawals_root, parent_beacon_block_root, - blob_gas_used: blob_gas_used.map(Into::into), - excess_blob_gas: excess_blob_gas.map(Into::into), + blob_gas_used, + excess_blob_gas, requests_hash, ..Default::default() } diff --git a/crates/engine/util/src/reorg.rs b/crates/engine/util/src/reorg.rs index e61b86346..395331084 100644 --- a/crates/engine/util/src/reorg.rs +++ b/crates/engine/util/src/reorg.rs @@ -358,7 +358,7 @@ where tx_type: tx.tx_type(), success: exec_result.result.is_success(), cumulative_gas_used, - logs: exec_result.result.into_logs().into_iter().map(Into::into).collect(), + logs: exec_result.result.into_logs().into_iter().collect(), ..Default::default() })); @@ -422,8 +422,8 @@ where receipts_root: outcome.ethereum_receipts_root(reorg_target.header.number).unwrap(), logs_bloom: outcome.block_logs_bloom(reorg_target.header.number).unwrap(), gas_used: cumulative_gas_used, - blob_gas_used: blob_gas_used.map(Into::into), - excess_blob_gas: excess_blob_gas.map(Into::into), + blob_gas_used, + excess_blob_gas, state_root: state_provider.state_root(hashed_state)?, requests_hash: None, // TODO(prague) target_blobs_per_block: None, // TODO(prague) diff --git a/crates/ethereum/payload/src/lib.rs b/crates/ethereum/payload/src/lib.rs index 667c78644..03427676e 100644 --- a/crates/ethereum/payload/src/lib.rs +++ b/crates/ethereum/payload/src/lib.rs @@ -341,7 +341,7 @@ where tx_type: tx.tx_type(), success: result.is_success(), cumulative_gas_used, - logs: result.into_logs().into_iter().map(Into::into).collect(), + logs: result.into_logs().into_iter().collect(), ..Default::default() })); @@ -469,8 +469,8 @@ where gas_used: cumulative_gas_used, extra_data: builder_config.extra_data, parent_beacon_block_root: attributes.parent_beacon_block_root, - blob_gas_used: blob_gas_used.map(Into::into), - excess_blob_gas: excess_blob_gas.map(Into::into), + blob_gas_used, + excess_blob_gas, requests_hash, target_blobs_per_block: None, }; diff --git a/crates/exex/exex/src/wal/storage.rs b/crates/exex/exex/src/wal/storage.rs index 699d88ba2..5e268ac5e 100644 --- a/crates/exex/exex/src/wal/storage.rs +++ b/crates/exex/exex/src/wal/storage.rs @@ -119,7 +119,7 @@ where ) -> impl Iterator)>> + '_ { range.map(move |id| { let (notification, size) = - self.read_notification(id)?.ok_or_eyre("notification {id} not found")?; + self.read_notification(id)?.ok_or_eyre(format!("notification {id} not found"))?; Ok((id, size, notification)) }) diff --git a/crates/net/network/src/session/active.rs b/crates/net/network/src/session/active.rs index 7b7837090..042cca69f 100644 --- a/crates/net/network/src/session/active.rs +++ b/crates/net/network/src/session/active.rs @@ -24,7 +24,7 @@ use futures::{stream::Fuse, SinkExt, StreamExt}; use metrics::Gauge; use reth_eth_wire::{ capability::RawCapabilityMessage, - errors::{EthHandshakeError, EthStreamError, P2PStreamError}, + errors::{EthHandshakeError, EthStreamError}, message::{EthBroadcastMessage, RequestPair}, Capabilities, DisconnectP2P, DisconnectReason, EthMessage, NetworkPrimitives, }; @@ -390,11 +390,7 @@ impl ActiveSession { /// Starts the disconnect process fn start_disconnect(&mut self, reason: DisconnectReason) -> Result<(), EthStreamError> { - self.conn - .inner_mut() - .start_disconnect(reason) - .map_err(P2PStreamError::from) - .map_err(Into::into) + Ok(self.conn.inner_mut().start_disconnect(reason)?) } /// Flushes the disconnect message and emits the corresponding message diff --git a/crates/optimism/payload/src/builder.rs b/crates/optimism/payload/src/builder.rs index 91b1c0aed..94bc853fc 100644 --- a/crates/optimism/payload/src/builder.rs +++ b/crates/optimism/payload/src/builder.rs @@ -821,7 +821,7 @@ where tx_type: sequencer_tx.tx_type(), success: result.is_success(), cumulative_gas_used: info.cumulative_gas_used, - logs: result.into_logs().into_iter().map(Into::into).collect(), + logs: result.into_logs().into_iter().collect(), deposit_nonce: depositor.map(|account| account.nonce), // The deposit receipt version was introduced in Canyon to indicate an update to how // receipt hashes should be computed when set. The state transition process @@ -922,7 +922,7 @@ where tx_type: tx.tx_type(), success: result.is_success(), cumulative_gas_used: info.cumulative_gas_used, - logs: result.into_logs().into_iter().map(Into::into).collect(), + logs: result.into_logs().into_iter().collect(), deposit_nonce: None, deposit_receipt_version: None, })); diff --git a/crates/optimism/payload/src/payload.rs b/crates/optimism/payload/src/payload.rs index 9577bbbec..d5ce7f9da 100644 --- a/crates/optimism/payload/src/payload.rs +++ b/crates/optimism/payload/src/payload.rs @@ -267,7 +267,7 @@ impl From for OpExecutionPayloadEnvelopeV3 { // Spec: // should_override_builder: false, - blobs_bundle: sidecars.into_iter().map(Into::into).collect::>().into(), + blobs_bundle: sidecars.into_iter().collect::>().into(), parent_beacon_block_root, } } @@ -294,7 +294,7 @@ impl From for OpExecutionPayloadEnvelopeV4 { // Spec: // should_override_builder: false, - blobs_bundle: sidecars.into_iter().map(Into::into).collect::>().into(), + blobs_bundle: sidecars.into_iter().collect::>().into(), parent_beacon_block_root, execution_requests: vec![], } diff --git a/crates/optimism/rpc/src/eth/pending_block.rs b/crates/optimism/rpc/src/eth/pending_block.rs index 3d930e2bf..535850c7f 100644 --- a/crates/optimism/rpc/src/eth/pending_block.rs +++ b/crates/optimism/rpc/src/eth/pending_block.rs @@ -122,7 +122,7 @@ where blob_gas_used: is_cancun.then(|| { transactions.iter().map(|tx| tx.blob_gas_used().unwrap_or_default()).sum::() }), - excess_blob_gas: block_env.get_blob_excess_gas().map(Into::into), + excess_blob_gas: block_env.get_blob_excess_gas(), extra_data: Default::default(), parent_beacon_block_root: is_cancun.then_some(B256::ZERO), requests_hash: is_prague.then_some(EMPTY_REQUESTS_HASH), @@ -147,7 +147,7 @@ where tx_type: tx.tx_type(), success: result.is_success(), cumulative_gas_used, - logs: result.into_logs().into_iter().map(Into::into).collect(), + logs: result.into_logs().into_iter().collect(), ..Default::default() } } diff --git a/crates/rpc/rpc-builder/src/auth.rs b/crates/rpc/rpc-builder/src/auth.rs index f22fd554c..d3cbfb2fc 100644 --- a/crates/rpc/rpc-builder/src/auth.rs +++ b/crates/rpc/rpc-builder/src/auth.rs @@ -75,10 +75,7 @@ impl AuthServerConfig { .clone() .unwrap_or_else(|| constants::DEFAULT_ENGINE_API_IPC_ENDPOINT.to_string()); let ipc_server = ipc_server_config.build(ipc_endpoint_str); - let res = ipc_server - .start(module.inner) - .await - .map_err(reth_ipc::server::IpcServerStartError::from)?; + let res = ipc_server.start(module.inner).await?; ipc_handle = Some(res); } diff --git a/crates/rpc/rpc-eth-api/src/helpers/call.rs b/crates/rpc/rpc-eth-api/src/helpers/call.rs index 4e2bf3e2d..d05929992 100644 --- a/crates/rpc/rpc-eth-api/src/helpers/call.rs +++ b/crates/rpc/rpc-eth-api/src/helpers/call.rs @@ -351,15 +351,13 @@ pub trait EthCall: EstimateCall + Call + LoadPendingBlock + LoadBlock + FullEthA let state_overrides = state_override.take(); let overrides = EvmOverrides::new(state_overrides, block_overrides.clone()); - let env = this - .prepare_call_env( - cfg_env_with_handler_cfg.clone(), - block_env.clone(), - tx, - &mut db, - overrides, - ) - .map(Into::into)?; + let env = this.prepare_call_env( + cfg_env_with_handler_cfg.clone(), + block_env.clone(), + tx, + &mut db, + overrides, + )?; let (res, _) = this.transact(&mut db, env)?; match ensure_success(res.result) { diff --git a/crates/rpc/rpc-eth-types/src/revm_utils.rs b/crates/rpc/rpc-eth-types/src/revm_utils.rs index 782ef5697..9d6c2c26c 100644 --- a/crates/rpc/rpc-eth-types/src/revm_utils.rs +++ b/crates/rpc/rpc-eth-types/src/revm_utils.rs @@ -20,7 +20,7 @@ use super::{EthApiError, EthResult, RpcInvalidTransactionError}; #[inline] pub fn get_precompiles(spec_id: SpecId) -> impl IntoIterator { let spec = PrecompileSpecId::from_spec_id(spec_id); - Precompiles::new(spec).addresses().copied().map(Address::from) + Precompiles::new(spec).addresses().copied() } /// Calculates the caller gas allowance. diff --git a/crates/rpc/rpc/src/eth/core.rs b/crates/rpc/rpc/src/eth/core.rs index e1e8c70d6..cf5753a34 100644 --- a/crates/rpc/rpc/src/eth/core.rs +++ b/crates/rpc/rpc/src/eth/core.rs @@ -537,7 +537,7 @@ mod tests { number: newest_block - i, gas_limit, gas_used, - base_fee_per_gas: base_fee_per_gas.map(Into::into), + base_fee_per_gas, parent_hash, ..Default::default() }; diff --git a/crates/rpc/rpc/src/eth/helpers/pending_block.rs b/crates/rpc/rpc/src/eth/helpers/pending_block.rs index 0713ebccd..29c327ee3 100644 --- a/crates/rpc/rpc/src/eth/helpers/pending_block.rs +++ b/crates/rpc/rpc/src/eth/helpers/pending_block.rs @@ -93,7 +93,7 @@ where blob_gas_used: is_cancun.then(|| { transactions.iter().map(|tx| tx.blob_gas_used().unwrap_or_default()).sum::() }), - excess_blob_gas: block_env.get_blob_excess_gas().map(Into::into), + excess_blob_gas: block_env.get_blob_excess_gas(), extra_data: Default::default(), parent_beacon_block_root: is_cancun.then_some(B256::ZERO), requests_hash: is_prague.then_some(EMPTY_REQUESTS_HASH), @@ -118,7 +118,7 @@ where tx_type: tx.tx_type(), success: result.is_success(), cumulative_gas_used, - logs: result.into_logs().into_iter().map(Into::into).collect(), + logs: result.into_logs().into_iter().collect(), ..Default::default() } } diff --git a/crates/rpc/rpc/src/eth/sim_bundle.rs b/crates/rpc/rpc/src/eth/sim_bundle.rs index 1b49a91c9..a9a6a17f5 100644 --- a/crates/rpc/rpc/src/eth/sim_bundle.rs +++ b/crates/rpc/rpc/src/eth/sim_bundle.rs @@ -171,8 +171,7 @@ where while idx < body.len() { match &body[idx] { BundleItem::Tx { tx, can_revert } => { - let recovered_tx = recover_raw_transaction::>(tx) - .map_err(EthApiError::from)?; + let recovered_tx = recover_raw_transaction::>(tx)?; let (tx, signer) = recovered_tx.to_components(); let tx: PoolConsensusTx = ::Transaction::pooled_into_consensus(tx); diff --git a/crates/stages/stages/src/stages/headers.rs b/crates/stages/stages/src/stages/headers.rs index 2a104d7eb..bf6611d9e 100644 --- a/crates/stages/stages/src/stages/headers.rs +++ b/crates/stages/stages/src/stages/headers.rs @@ -526,10 +526,7 @@ mod tests { // validate the header total difficulty td += header.difficulty; - assert_eq!( - provider.header_td_by_number(block_num)?.map(Into::into), - Some(td) - ); + assert_eq!(provider.header_td_by_number(block_num)?, Some(td)); } } _ => self.check_no_header_entry_above(initial_checkpoint)?, diff --git a/crates/storage/provider/src/providers/consistent.rs b/crates/storage/provider/src/providers/consistent.rs index 41ae38528..f72e0a1d5 100644 --- a/crates/storage/provider/src/providers/consistent.rs +++ b/crates/storage/provider/src/providers/consistent.rs @@ -917,14 +917,7 @@ impl TransactionsProvider for ConsistentProvider { id.into(), |provider| provider.transaction_by_id(id), |tx_index, _, block_state| { - Ok(block_state - .block_ref() - .block() - .body - .transactions() - .get(tx_index) - .cloned() - .map(Into::into)) + Ok(block_state.block_ref().block().body.transactions().get(tx_index).cloned()) }, ) } @@ -937,14 +930,7 @@ impl TransactionsProvider for ConsistentProvider { id.into(), |provider| provider.transaction_by_id_unhashed(id), |tx_index, _, block_state| { - Ok(block_state - .block_ref() - .block() - .body - .transactions() - .get(tx_index) - .cloned() - .map(Into::into)) + Ok(block_state.block_ref().block().body.transactions().get(tx_index).cloned()) }, ) } diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index 5d0491f51..006ba369b 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -1042,9 +1042,7 @@ impl HeaderProvider for DatabasePro StaticFileSegment::Headers, to_range(range), |static_file, range, _| static_file.headers_range(range), - |range, _| { - self.cursor_read_collect::>(range).map_err(Into::into) - }, + |range, _| self.cursor_read_collect::>(range), |_| true, ) } @@ -1120,9 +1118,7 @@ impl BlockHashReader for DatabaseProvider(range).map_err(Into::into) - }, + |range, _| self.cursor_read_collect::(range), |_| true, ) } @@ -1517,7 +1513,7 @@ impl TransactionsProvider for Datab &self, range: impl RangeBounds, ) -> ProviderResult> { - self.cursor_read_collect::(range).map_err(Into::into) + self.cursor_read_collect::(range) } fn transaction_sender(&self, id: TxNumber) -> ProviderResult> { @@ -1570,10 +1566,7 @@ impl ReceiptProvider for DatabasePr StaticFileSegment::Receipts, to_range(range), |static_file, range, _| static_file.receipts_by_tx_range(range), - |range, _| { - self.cursor_read_collect::>(range) - .map_err(Into::into) - }, + |range, _| self.cursor_read_collect::>(range), |_| true, ) }