Merge pull request #145 from anton-rs/refcell/small-nits

chore: Smaller Nits

bin/reth/Cargo.toml

@@ -121,7 +121,6 @@ min-debug-logs = ["tracing/release_max_level_debug"]
 min-trace-logs = ["tracing/release_max_level_trace"]
 optimism = [
   "reth-primitives/optimism",
-  "reth-primitives/value-256",
   "reth-revm/optimism",
   "reth-interfaces/optimism",
   "reth-rpc/optimism",

bin/reth/src/args/payload_builder_args.rs

@@ -98,7 +98,7 @@ impl TypedValueParser for ExtradataValueParser {
                 format!(
                     "Payload builder extradata size exceeds {MAXIMUM_EXTRA_DATA_SIZE}bytes limit"
                 ),
-            ));
+            ))
         }
         Ok(val.to_string())
     }

bin/reth/src/debug_cmd/build_block.rs

@@ -246,11 +246,8 @@ impl Command {
             // TODO: add support for withdrawals
             withdrawals: None,
             #[cfg(feature = "optimism")]
-            optimism_payload_attributes: reth_rpc_types::engine::OptimismPayloadAttributes {
-                transactions: None,
-                no_tx_pool: None,
-                gas_limit: None,
-            },
+            optimism_payload_attributes: reth_rpc_types::engine::OptimismPayloadAttributes::default(
+            ),
         };
         let payload_config = PayloadConfig::new(
             Arc::clone(&best_block),

bin/reth/src/lib.rs

@@ -39,7 +39,6 @@ pub mod dirs;
 pub mod init;
 pub mod node;
 pub mod p2p;
-pub mod precaution;
 pub mod prometheus_exporter;
 pub mod recover;
 pub mod runner;

bin/reth/src/main.rs

@@ -4,10 +4,6 @@
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 fn main() {
-    // Ensure feature flags are set correctly for different chains
-    reth::precaution::ensure_ethereum!();
-    reth::precaution::ensure_optimism!();
-
     if let Err(err) = reth::cli::run() {
         eprintln!("Error: {err:?}");
         std::process::exit(1);

bin/reth/src/node/mod.rs

@@ -87,11 +87,6 @@ use std::{
 use tokio::sync::{mpsc::unbounded_channel, oneshot, watch};
 use tracing::*;
 
-#[cfg(feature = "optimism")]
-use reth_rpc_api::EngineApiClient;
-#[cfg(feature = "optimism")]
-use reth_rpc_types::engine::ForkchoiceState;
-
 pub mod cl_events;
 pub mod events;
 
@@ -563,9 +558,9 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
         #[cfg(feature = "optimism")]
         if self.chain.optimism && !self.rollup.enable_genesis_walkback {
             let client = _rpc_server_handles.auth.http_client();
-            EngineApiClient::fork_choice_updated_v2(
+            reth_rpc_api::EngineApiClient::fork_choice_updated_v2(
                 &client,
-                ForkchoiceState {
+                reth_rpc_types::engine::ForkchoiceState {
                     head_block_hash: head.hash,
                     safe_block_hash: head.hash,
                     finalized_block_hash: head.hash,
@@ -794,15 +789,15 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
         // try to look up the header in the database
         if let Some(header) = header {
             info!(target: "reth::cli", ?tip, "Successfully looked up tip block in the database");
-            return Ok(header.seal_slow());
+            return Ok(header.seal_slow())
         }
 
         info!(target: "reth::cli", ?tip, "Fetching tip block from the network.");
         loop {
             match get_single_header(&client, tip).await {
                 Ok(tip_header) => {
                     info!(target: "reth::cli", ?tip, "Successfully fetched tip");
-                    return Ok(tip_header);
+                    return Ok(tip_header)
                 }
                 Err(error) => {
                     error!(target: "reth::cli", %error, "Failed to fetch the tip. Retrying...");