cleanup: some clippy and stuff

alloy-rs · Aug 2, 2023 · d45a19d · d45a19d
1 parent dcdb4cf
commit d45a19d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 54 deletions.
diff --git a/crates/network/Cargo.toml b/crates/network/Cargo.toml
@@ -9,3 +9,4 @@ edition = "2021"
 alloy-json-rpc.workspace = true
 alloy-rlp.workspace = true
 alloy-transports.workspace = true
+tower = "0.4.13"
diff --git a/crates/network/src/lib.rs b/crates/network/src/lib.rs
@@ -10,42 +10,30 @@ pub trait Transaction: alloy_rlp::Encodable + alloy_rlp::Decodable + RpcObject {
 
 pub trait Eip1559Transaction: Transaction {}
 
-// pub trait Middleware<N: Network>
-// where
-//     <Self::Transport as Transport>::Fut: Send,
-// {
-//     type Transport: Transport;
-//     type Inner: Middleware<N, Transport = Self::Transport>;
-
-//     fn client(&self) -> &RpcClient<Self::Transport>;
-
-//     fn inner(&self) -> &Self::Inner;
-
-//     fn send_transaction(
-//         &self,
-//         tx: &N::Transaction,
-//     ) -> RpcCall<Self::Transport, N::Transaction, N::Receipt> {
-//         self.inner().send_transaction(tx)
-//     }
-// }
-
-// impl<N: Network, T: Transport> Middleware<N> for RpcClient<T> {
-//     type Transport = T;
-
-//     type Inner = Self;
-
-//     fn client(&self) -> &RpcClient<Self::Transport> {
-//         self
-//     }
-
-//     fn inner(&self) -> &Self::Inner {
-//         panic!("called inner on RpcClient")
-//     }
-
-//     fn send_transaction(
-//         &self,
-//         tx: &N::Transaction,
-//     ) -> RpcCall<Self::Transport, N::Transaction, N::Receipt> {
-//         self.prepare("eth_sendTransaction", tx)
-//     }
-// }
+pub trait Middleware<N: Network, T: Transport> {
+    type Inner: Middleware<N, T>;
+
+    fn client(&self) -> &RpcClient<T>;
+
+    fn inner(&self) -> &Self::Inner;
+
+    fn send_transaction(&self, tx: &N::Transaction) -> RpcCall<T, N::Transaction, N::Receipt> {
+        self.inner().send_transaction(tx)
+    }
+}
+
+impl<N: Network, T: Transport> Middleware<N, T> for RpcClient<T> {
+    type Inner = Self;
+
+    fn client(&self) -> &RpcClient<T> {
+        self
+    }
+
+    fn inner(&self) -> &Self::Inner {
+        panic!("called inner on RpcClient")
+    }
+
+    fn send_transaction(&self, tx: &N::Transaction) -> RpcCall<T, N::Transaction, N::Receipt> {
+        self.prepare("eth_sendTransaction", tx)
+    }
+}
diff --git a/crates/transports/src/lib.rs b/crates/transports/src/lib.rs
@@ -19,18 +19,3 @@ mod transports;
 pub use transports::{Http, Transport};
 
 pub use alloy_json_rpc::RpcResult;
-
-#[cfg(test)]
-mod test {
-    use tower::util::BoxCloneService;
-
-    use super::*;
-
-    fn box_clone_transport() -> BoxCloneService<
-        Box<serde_json::value::RawValue>,
-        Box<serde_json::value::RawValue>,
-        TransportError,
-    > {
-        BoxCloneService::new(Http::new("http://localhost:8545".parse().unwrap()))
-    }
-}