resolve conflicts

alloy-rs · yash-atreya · Jun 21, 2024 · Jun 24, 2024 · Jun 24, 2024 · Jun 24, 2024
commit 47ee0c6a235f78035cb51072e35136dcf923b533
@@ -137,9 +137,10 @@ semver = "1.0"
 thiserror = "1.0"
 thiserror-no-std = "2.0.2"
 url = "2.5"
-derive_more = "1.0.0"
 lru = "0.12"
 parking_lot = "0.12.3"
+derive_more = { version = "1.0.0", default-features = false }
+http = "1.1.0"
 
 ## serde
 serde = { version = "1.0", default-features = false, features = [

diff --git a/crates/provider/src/provider/trait.rs b/crates/provider/src/provider/trait.rs
@@ -1024,8 +1024,23 @@ mod tests {
     use alloy_node_bindings::Anvil;
     use alloy_primitives::{address, b256, bytes, keccak256};
     use alloy_rpc_client::ClientBuilder;
-    use alloy_rpc_types_eth::request::TransactionRequest;
+    use alloy_rpc_types_eth::{request::TransactionRequest, Block};
     use alloy_transport::layers::CacheLayer;
+    // For layer transport tests
+    #[cfg(feature = "hyper")]
+    use alloy_transport_http::{
+        hyper,
+        hyper::body::Bytes as HyperBytes,
+        hyper_util::{
+            client::legacy::{Client, Error},
+            rt::TokioExecutor,
+        },
+        HyperResponse, HyperResponseFut,
+    };
+    #[cfg(feature = "hyper")]
+    use http_body_util::Full;
+    #[cfg(feature = "hyper")]
+    use tower::{Layer, Service};
 
     fn init_tracing() {
         let _ = tracing_subscriber::fmt::try_init();

diff --git a/crates/transport/src/layers/cache.rs b/crates/transport/src/layers/cache.rs
@@ -138,7 +138,7 @@ pub struct CachingService<S> {
 
 impl<S> CachingService<S> {
     /// Instantiate a new cache service.
-    pub fn new(inner: S, layer: CacheLayer) -> Self {
+    pub const fn new(inner: S, layer: CacheLayer) -> Self {
         Self { inner, layer }
     }
 
@@ -157,7 +157,7 @@ impl<S> CachingService<S> {
     }
 
     /// Handles a cache hit.
-    fn handle_cache_hit(&self, id: Id, raw: Box<RawValue>) -> ResponsePacket {
+    const fn handle_cache_hit(&self, id: Id, raw: Box<RawValue>) -> ResponsePacket {
         let payload = ResponsePayload::Success(raw);
         let response = Response { id, payload };
         ResponsePacket::Single(response)