Fix lint

flashbots · Dec 31, 2024 · 9434fe4 · 9434fe4
1 parent f803134
commit 9434fe4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/crates/rbuilder/src/blocklist/mod.rs b/crates/rbuilder/src/blocklist/mod.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Deserializer};
 use std::fs::read_to_string;
 use std::path::PathBuf;
 
+#[allow(clippy::len_without_is_empty)]
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct BlockList {
     list: HashSet<Address>,

diff --git a/crates/rbuilder/src/live_builder/base_config.rs b/crates/rbuilder/src/live_builder/base_config.rs
@@ -308,17 +308,6 @@ impl BaseConfig {
         Ok(extra_data)
     }
 
-<<<<<<< Updated upstream
-    pub fn blocklist(&self) -> eyre::Result<HashSet<Address>> {
-        if let Some(path) = &self.blocklist_file_path {
-            let blocklist_file = read_to_string(path).context("blocklist file")?;
-            let blocklist: Vec<Address> =
-                serde_json::from_str(&blocklist_file).context("blocklist file")?;
-            return Ok(blocklist.into_iter().collect());
-        }
-        Ok(HashSet::default())
-    }
-
     pub async fn flashbots_db(&self) -> eyre::Result<Option<PgPool>> {
         if let Some(url) = &self.flashbots_db {
             let url = url.value()?;
@@ -329,8 +318,6 @@ impl BaseConfig {
         }
     }
 
-=======
->>>>>>> Stashed changes
     pub fn eth_rpc_provider(&self) -> eyre::Result<BoxedProvider> {
         Ok(http_provider(self.backtest_fetch_eth_rpc_url.parse()?))
     }