chore(bin): import cleanup

refcell · Nov 10, 2023 · ffbeadc · ffbeadc
1 parent 8314673
commit ffbeadc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/bin/mev/src/cmd/boost.rs b/bin/mev/src/cmd/boost.rs
@@ -1,7 +1,6 @@
 use crate::cmd::config::Config;
 use clap::Args;
 use mev_boost_rs::Service;
-use tracing::info;
 
 #[derive(Debug, Args)]
 #[clap(about = "🚀 connecting proposers to the external builder network")]
@@ -17,7 +16,7 @@ impl Command {
         let config = Config::from_toml_file(config_file)?;
 
         let network = config.network;
-        info!("configured for `{network}`");
+        tracing::info!("configured for `{network}`");
 
         if let Some(config) = config.boost {
             Ok(Service::from(network, config).spawn()?.await?)

diff --git a/bin/mev/src/cmd/config.rs b/bin/mev/src/cmd/config.rs
@@ -1,16 +1,15 @@
 use clap::Args;
 use ethereum_consensus::networks::Network;
 use eyre::WrapErr;
+use serde::Deserialize;
+use std::{fmt, path::Path};
+
 #[cfg(feature = "boost")]
 use mev_boost_rs::Config as BoostConfig;
 #[cfg(feature = "build")]
 use mev_build_rs::reth_builder::Config as BuildConfig;
 #[cfg(feature = "relay")]
 use mev_relay_rs::Config as RelayConfig;
-use mev_rs::config::from_toml_file;
-use serde::Deserialize;
-use std::{fmt, path::Path};
-use tracing::info;
 
 #[derive(Debug, Deserialize)]
 pub struct Config {
@@ -28,7 +27,7 @@ impl Config {
     pub fn from_toml_file<P: AsRef<Path> + fmt::Display>(path: P) -> eyre::Result<Config> {
         tracing::info!("loading config from `{path}`...");
 
-        from_toml_file::<_, Self>(path.as_ref()).wrap_err("could not parse TOML")
+        mev_rs::config::from_toml_file::<_, Self>(path.as_ref()).wrap_err("could not parse TOML")
     }
 }
 
@@ -44,7 +43,7 @@ impl Command {
         let config_file = self.config_file;
 
         let config = Config::from_toml_file(config_file)?;
-        info!("{config:#?}");
+        tracing::info!("{config:#?}");
 
         Ok(())
     }

diff --git a/bin/mev/src/cmd/mod.rs b/bin/mev/src/cmd/mod.rs
@@ -1,7 +1,8 @@
+pub mod config;
+
 #[cfg(feature = "boost")]
 pub mod boost;
 #[cfg(feature = "build")]
 pub mod build;
-pub mod config;
 #[cfg(feature = "relay")]
 pub mod relay;
diff --git a/bin/mev/src/cmd/relay.rs b/bin/mev/src/cmd/relay.rs
@@ -1,7 +1,6 @@
 use crate::cmd::config::Config;
 use clap::{Args, Subcommand};
 use mev_relay_rs::Service;
-use tracing::info;
 
 #[derive(Debug, Args)]
 #[clap(about = "🏗 connecting builders to proposers", subcommand_negates_reqs = true)]
@@ -31,7 +30,7 @@ impl Command {
         let config = Config::from_toml_file(config_file)?;
 
         let network = config.network;
-        info!("configured for `{network}`");
+        tracing::info!("configured for `{network}`");
 
         if let Some(config) = config.relay {
             let service = Service::from(network, config).spawn().await?;

diff --git a/bin/mev/src/main.rs b/bin/mev/src/main.rs
@@ -1,10 +1,10 @@
-mod cmd;
-
 use clap::{Parser, Subcommand};
 use std::future::Future;
 use tokio::signal;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
+mod cmd;
+
 #[derive(Debug, Parser)]
 #[clap(author, version, about = "utilities for block space", long_about = None)]
 struct Cli {