From b7a8d1e2bdee49d6c2003be6d0517b3f4fd2b033 Mon Sep 17 00:00:00 2001
From: James <james@prestwi.ch>
Date: Wed, 9 Aug 2023 15:21:20 -0700
Subject: [PATCH] chore: clippy cleanup

---
 Cargo.toml                               |   2 +-
 crates/middleware/Cargo.toml             |   4 +-
 crates/middleware/src/lib.rs             | 109 +++++++++++------------
 crates/networks/Cargo.toml               |   2 +-
 crates/networks/src/lib.rs               |   5 +-
 crates/transports/src/transports/http.rs |   2 +-
 6 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 77b107043ab..35d16791ac1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 alloy-json-rpc = { path = "crates/json-rpc" }
 alloy-transports = { path = "crates/transports" }
-alloy-networks = { path = "crates/network" }
+alloy-networks = { path = "crates/networks" }
 
 alloy-primitives = { version = "0.2.0", features = ["serde"] }
 alloy-rlp = "0.3.0"
diff --git a/crates/middleware/Cargo.toml b/crates/middleware/Cargo.toml
index 4949df49948..898de7e2fa8 100644
--- a/crates/middleware/Cargo.toml
+++ b/crates/middleware/Cargo.toml
@@ -12,4 +12,6 @@ exclude.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-alloy-network.workspace = true
+alloy-json-rpc.workspace = true
+alloy-networks.workspace = true
+alloy-transports.workspace = true
diff --git a/crates/middleware/src/lib.rs b/crates/middleware/src/lib.rs
index ccf1baa2fac..076c38db28c 100644
--- a/crates/middleware/src/lib.rs
+++ b/crates/middleware/src/lib.rs
@@ -1,14 +1,14 @@
-use alloy_network::Network;
-use alloy_transport::{BoxTransport, RpcCall, RpcClient, Transport, TransportError};
+use alloy_networks::Network;
+use alloy_transports::{BoxTransport, RpcClient, Transport};
 
 pub trait Middleware<N: Network, T: Transport = BoxTransport> {
     fn client(&self) -> &RpcClient<T>;
 
     fn inner(&self) -> &dyn Middleware<N, T>;
 
-    fn send_transaction(&self, tx: N::Transaction) -> MwareCall<T, N, N::Transaction, N::Receipt> {
-        self.inner().send_transaction(tx)
-    }
+    // fn send_transaction(&self, tx: N::Transaction) -> MwareCall<T, N, N::Transaction, N::Receipt> {
+    //     self.inner().send_transaction(tx)
+    // }
 }
 
 impl<N: Network, T: Transport> Middleware<N, T> for RpcClient<T> {
@@ -20,57 +20,56 @@ impl<N: Network, T: Transport> Middleware<N, T> for RpcClient<T> {
         panic!("called inner on <RpcClient as Middleware>")
     }
 
-    fn send_transaction(&self, tx: N::Transaction) -> MwareCall<T, N, N::Transaction, N::Receipt> {
-        self.prepare("eth_sendTransaction", tx).into()
-    }
-}
-
-pub struct MwareCall<T, N, Params, Resp>
-where
-    T: Transport,
-    N: Network,
-    Params: RpcParam,
-    Resp: RpcReturn,
-{
-    pub(crate) inner: RpcCall<T, Params, Resp>,
-    pub(crate) pre: Option<
-        Box<
-            dyn FnOnce(
-                Params,
-            )
-                -> Box<dyn std::future::Future<Output = Result<Params, TransportError>>>,
-        >,
-    >,
-    pub(crate) post: Option<
-        Box<
-            dyn FnOnce(Resp) -> Box<dyn std::future::Future<Output = Result<Resp, TransportError>>>,
-        >,
-    >,
-    _pd: PhantomData<fn() -> N>,
+    // fn send_transaction(&self, tx: N::Transaction) -> MwareCall<T, N, N::Transaction, N::Receipt> {
+    //     self.prepare("eth_sendTransaction", tx).into()
+    // }
 }
+// pub struct MwareCall<T, N, Params, Resp>
+// where
+//     T: Transport,
+//     N: Network,
+//     Params: RpcParam,
+//     Resp: RpcReturn,
+// {
+//     pub(crate) inner: RpcCall<T, Params, Resp>,
+//     pub(crate) pre: Option<
+//         Box<
+//             dyn FnOnce(
+//                 Params,
+//             )
+//                 -> Box<dyn std::future::Future<Output = Result<Params, TransportError>>>,
+//         >,
+//     >,
+//     pub(crate) post: Option<
+//         Box<
+//             dyn FnOnce(Resp) -> Box<dyn std::future::Future<Output = Result<Resp, TransportError>>>,
+//         >,
+//     >,
+//     _pd: PhantomData<fn() -> N>,
+// }
 
-impl<T, N, Params, Resp> From<RpcCall<T, Params, Resp>> for MwareCall<T, N, Params, Resp>
-where
-    T: Transport,
-    N: Network,
-    Params: RpcParam,
-    Resp: RpcReturn,
-{
-    fn from(value: RpcCall<T, Params, Resp>) -> Self {
-        Self {
-            inner: value,
-            pre: None,
-            post: None,
-            _pd: PhantomData,
-        }
-    }
-}
+// impl<T, N, Params, Resp> From<RpcCall<T, Params, Resp>> for MwareCall<T, N, Params, Resp>
+// where
+//     T: Transport,
+//     N: Network,
+//     Params: RpcParam,
+//     Resp: RpcReturn,
+// {
+//     fn from(value: RpcCall<T, Params, Resp>) -> Self {
+//         Self {
+//             inner: value,
+//             pre: None,
+//             post: None,
+//             _pd: PhantomData,
+//         }
+//     }
+// }
 
-#[cfg(test)]
-mod test {
-    use super::Middleware;
+// #[cfg(test)]
+// mod test {
+//     use super::Middleware;
 
-    fn _compile_check<N>() -> Box<dyn Middleware<N>> {
-        todo!()
-    }
-}
+//     fn _compile_check<N>() -> Box<dyn Middleware<N>> {
+//         todo!()
+//     }
+// }
diff --git a/crates/networks/Cargo.toml b/crates/networks/Cargo.toml
index 853b9128ad0..6af87d82e4e 100644
--- a/crates/networks/Cargo.toml
+++ b/crates/networks/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "alloy-network"
+name = "alloy-networks"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
diff --git a/crates/networks/src/lib.rs b/crates/networks/src/lib.rs
index fe47a9b7678..f157ea94bd8 100644
--- a/crates/networks/src/lib.rs
+++ b/crates/networks/src/lib.rs
@@ -1,7 +1,4 @@
-use std::marker::PhantomData;
-
-use alloy_json_rpc::{RpcObject, RpcParam, RpcReturn};
-use alloy_transports::{BoxTransport, RpcCall, RpcClient, Transport, TransportError};
+use alloy_json_rpc::RpcObject;
 
 pub trait Network {
     type Transaction: Transaction;
diff --git a/crates/transports/src/transports/http.rs b/crates/transports/src/transports/http.rs
index 30f866940a1..1ae6ad41b76 100644
--- a/crates/transports/src/transports/http.rs
+++ b/crates/transports/src/transports/http.rs
@@ -15,7 +15,7 @@ where
         Self {
             transport,
             is_local,
-            id: AtomicU64::new(0).into(),
+            id: AtomicU64::new(0),
         }
     }
 }