cargo clippy, sort, test

Cargo.toml

@@ -42,7 +42,6 @@ url = "2.4.1"
 reqwest = { version = "0.11.22", features = ["json"] }
 # [features]# load-test = ["goose", "reqwest", "once_cell", "toml"]
 
-
 [[bin]]
 name = "tree-availability-service"
 path = "bin/tree_availability_service.rs"

bin/load_test/goose_functions/mod.rs

@@ -172,8 +172,7 @@ pub async fn assert_response(
                     ?expect_some,
                     "Inclusion proof response did not match expectation"
                 );
-            } else {
-            }
+            } 
         } else {
             tracing::warn!(
                 ?identity,

bin/load_test/shadow_tree/mod.rs

@@ -17,6 +17,9 @@ use world_tree::tree::{Hash, PoseidonTree};
 use crate::utils::Profile;
 use crate::SHADOW_TREE;
 
+pub type ShadowTreeError =
+    TreeAvailabilityError<Provider<ThrottledProvider<ethers::providers::Http>>>;
+
 pub struct ShadowWorldTree<M: Middleware> {
     pub tree_data: Arc<TreeData>,
     pub tree_updater: Arc<TreeUpdater<M>>,
@@ -98,16 +101,7 @@ impl Default for ShadowWorldTree<Provider<ThrottledProvider<Http>>> {
 
 pub async fn initialize_shadow_tree(
     profile: &Profile,
-) -> eyre::Result<
-    JoinHandle<
-        Result<
-            (),
-            TreeAvailabilityError<
-                Provider<ThrottledProvider<ethers::providers::Http>>,
-            >,
-        >,
-    >,
-> {
+) -> eyre::Result<JoinHandle<Result<(), ShadowTreeError>>> {
     let http_provider =
         ethers::providers::Http::new(Url::parse(&profile.rpc_endpoint)?);
 
@@ -134,7 +128,7 @@ pub async fn initialize_shadow_tree(
     // Sync to head
     let tree_data = &shadow_tree.tree_data;
     let tree_updater = &shadow_tree.tree_updater;
-    tree_updater.sync_to_head(&tree_data).await?;
+    tree_updater.sync_to_head(tree_data).await?;
 
     let handles = shadow_tree.spawn();
 

bin/load_test/utils.rs

@@ -94,7 +94,7 @@ where
     D: serde::Deserializer<'de>,
 {
     let str = <String>::deserialize(deserializer)?;
-    Ok(H160::from_str(&str).map_err(serde::de::Error::custom)?)
+    H160::from_str(&str).map_err(serde::de::Error::custom)
 }
 
 pub fn read_config(file_path: &str) -> eyre::Result<Config> {

src/tree/service.rs

@@ -9,7 +9,7 @@ use axum::{middleware, Json};
 use axum_middleware::logging;
 use ethers::providers::Middleware;
 use ethers::types::H160;
-use semaphore::identity;
+
 use semaphore::lazy_merkle_tree::Canonical;
 use serde::{Deserialize, Serialize};
 use tokio::task::JoinHandle;

src/tree/tree_data.rs

@@ -155,14 +155,14 @@ impl TreeData {
             tracing::info!(?identity, ?latest_root, "Getting inclusion proof");
 
             if let Some(proof) = Self::proof(&tree, identity) {
-                return Some(InclusionProof::new(latest_root, proof, None));
+                Some(InclusionProof::new(latest_root, proof, None))
             } else {
                 tracing::warn!(
                     ?identity,
                     ?root,
                     "Identity not in tree at root"
                 );
-                return None;
+                None
             }
         }
     }