fixes

Author: refcell

Cargo.lock

@@ -59,6 +59,3 @@ metrics.workspace = true
 [build-dependencies]
 vergen = { workspace = true, features = ["build", "cargo", "emit_and_set"] }
 vergen-git2.workspace = true
-
-[dev-dependencies]
-rstest.workspace = true

bin/consensus/Cargo.toml

@@ -11,7 +11,7 @@ use std::{
     str::FromStr,
 };
 
-use alloy_primitives::{b256, B256};
+use alloy_primitives::{B256, b256};
 use alloy_provider::Provider;
 use alloy_signer_local::PrivateKeySigner;
 use clap::Parser;
@@ -451,18 +451,18 @@ impl P2PArgs {
         let mut gossip_address = libp2p::Multiaddr::from(self.listen_ip);
         gossip_address.push(libp2p::multiaddr::Protocol::Tcp(self.listen_tcp_port));
 
-        let unsafe_block_signer = self
-            .unsafe_block_signer(l2_chain_id, config, l1_rpc, genesis_signer)
-            .await?;
-
-        let bootstore = if self.disable_bootstore {
-            None
-        } else {
-            Some(self.bootstore.map_or(
-                BootStoreFile::Default { chain_id: l2_chain_id },
-                BootStoreFile::Custom,
-            ))
-        };
+        let unsafe_block_signer =
+            self.unsafe_block_signer(l2_chain_id, config, l1_rpc, genesis_signer).await?;
+
+        let bootstore =
+            if self.disable_bootstore {
+                None
+            } else {
+                Some(self.bootstore.map_or(
+                    BootStoreFile::Default { chain_id: l2_chain_id },
+                    BootStoreFile::Custom,
+                ))
+            };
 
         let bootnodes = self
             .bootnodes

crates/client/cli/src/p2p.rs

@@ -6,7 +6,7 @@
 use std::{path::PathBuf, str::FromStr};
 
 use alloy_primitives::{Address, B256};
-use alloy_signer::{k256::ecdsa, Signer};
+use alloy_signer::{Signer, k256::ecdsa};
 use alloy_signer_local::PrivateKeySigner;
 use clap::Parser;
 use kona_cli::SecretKeyLoader;
@@ -122,9 +122,8 @@ impl SignerArgs {
         let gossip_signer: Option<BlockSigner> = match (sequencer_key, self.config_remote()?) {
             (Some(_), Some(_)) => return Err(SignerArgsParseError::LocalAndRemoteSigner),
             (Some(key), None) => {
-                let signer: BlockSigner = PrivateKeySigner::from_bytes(&key)?
-                    .with_chain_id(Some(l2_chain_id))
-                    .into();
+                let signer: BlockSigner =
+                    PrivateKeySigner::from_bytes(&key)?.with_chain_id(Some(l2_chain_id)).into();
                 Some(signer)
             }
             (None, Some(signer)) => Some(signer.into()),

crates/client/cli/src/signer.rs

@@ -18,6 +18,9 @@ test-utils = [
 	"dep:eyre",
 	"reth-evm/test-utils",
 	"reth-primitives/test-utils",
+	"reth-chainspec/test-utils",
+	"reth-provider/test-utils",
+	"reth-revm/test-utils"
 ]
 
 [dependencies]

crates/client/flashblocks/Cargo.toml

@@ -44,6 +44,8 @@ test-utils = [
 	"reth-optimism-node/test-utils",
 	"reth-primitives-traits?/test-utils",
 	"reth-provider/test-utils",
+	"reth-chainspec?/test-utils",
+	"reth-node-builder/test-utils"
 ]
 
 [dependencies]

crates/client/node/Cargo.toml

@@ -22,10 +22,10 @@ mod styles;
 pub use styles::CliStyles;
 
 mod logging;
-pub use logging::{FileLogConfig, LogConfig, LogRotation, StdoutLogConfig};
+pub use logging::{FileLogConfig, LogConfig, LogFormat, LogRotation, StdoutLogConfig};
 
 mod tracing;
-pub use tracing::{LogFormat, init_test_tracing};
+pub use tracing::init_test_tracing;
 
 mod version;
 pub use version::Version;

crates/shared/cli-utils/src/lib.rs

@@ -6,7 +6,27 @@ use clap::ValueEnum;
 use serde::{Deserialize, Serialize};
 use tracing::level_filters::LevelFilter;
 
-use crate::{LogArgs, LogFormat};
+use crate::LogArgs;
+
+/// The format of the logs.
+#[derive(
+    Default, Debug, Clone, Copy, PartialEq, Eq, Hash, clap::ValueEnum, Serialize, Deserialize,
+)]
+#[serde(rename_all = "lowercase")]
+#[clap(rename_all = "lowercase")]
+pub enum LogFormat {
+    /// Full format (default).
+    #[default]
+    Full,
+    /// JSON format.
+    Json,
+    /// Pretty format.
+    Pretty,
+    /// Compact format.
+    Compact,
+    /// Logfmt format.
+    Logfmt,
+}
 
 /// The rotation of the log files.
 #[derive(Debug, Clone, Serialize, Deserialize, ValueEnum, Default)]

crates/shared/cli-utils/src/logging.rs

@@ -2,7 +2,6 @@
 
 use std::fmt;
 
-use serde::{Deserialize, Serialize};
 use tracing_subscriber::{
     EnvFilter, Layer,
     fmt::{
@@ -14,27 +13,7 @@ use tracing_subscriber::{
     util::{SubscriberInitExt, TryInitError},
 };
 
-use crate::{LogConfig, LogRotation};
-
-/// The format of the logs.
-#[derive(
-    Default, Debug, Clone, Copy, PartialEq, Eq, Hash, clap::ValueEnum, Serialize, Deserialize,
-)]
-#[serde(rename_all = "lowercase")]
-#[clap(rename_all = "lowercase")]
-pub enum LogFormat {
-    /// Full format (default).
-    #[default]
-    Full,
-    /// JSON format.
-    Json,
-    /// Pretty format.
-    Pretty,
-    /// Compact format.
-    Compact,
-    /// Logfmt format.
-    Logfmt,
-}
+use crate::{LogConfig, LogFormat, LogRotation};
 
 /// Custom logfmt formatter for tracing events.
 struct LogfmtFormatter;