- fix custom protocol example

- remove Handler helper struct in rpc
- add iroh to allowed git deps

Author: rklaehn

deny.toml

@@ -38,5 +38,5 @@ ignore = [
 
 [sources]
 allow-git = [
-    # "https://github.com/n0-computer/iroh.git",
+    "https://github.com/n0-computer/iroh.git",
 ]

examples/custom-protocol.rs

@@ -144,7 +144,8 @@ impl ProtocolHandler for BlobSearch {
     ///
     /// The returned future runs on a newly spawned tokio task, so it can run as long as
     /// the connection lasts.
-    fn accept(self: Arc<Self>, connecting: Connecting) -> BoxedFuture<Result<()>> {
+    fn accept(&self, connecting: Connecting) -> BoxedFuture<Result<()>> {
+        let this = self.clone();
         // We have to return a boxed future from the handler.
         Box::pin(async move {
             // Wait for the connection to be fully established.
@@ -162,7 +163,7 @@ impl ProtocolHandler for BlobSearch {
 
             // Now, we can perform the actual query on our local database.
             let query = String::from_utf8(query_bytes)?;
-            let hashes = self.query_local(&query);
+            let hashes = this.query_local(&query);
 
             // We want to return a list of hashes. We do the simplest thing possible, and just send
             // one hash after the other. Because the hashes have a fixed size of 32 bytes, this is

src/rpc.rs

@@ -2,7 +2,6 @@
 
 use std::{
     io,
-    ops::Deref,
     sync::{Arc, Mutex},
 };
 
@@ -82,29 +81,12 @@ impl<D: crate::store::Store> Blobs<D> {
         C: ChannelTypes<RpcService>,
     {
         use Request::*;
-        let handler = Handler(self);
+        let handler = self;
         match msg {
             Blobs(msg) => handler.handle_blobs_request(msg, chan).await,
             Tags(msg) => handler.handle_tags_request(msg, chan).await,
         }
     }
-}
-
-#[derive(Clone)]
-struct Handler<S>(Blobs<S>);
-
-impl<S> Deref for Handler<S> {
-    type Target = Blobs<S>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<D: crate::store::Store> Handler<D> {
-    fn store(&self) -> &D {
-        &self.0.store
-    }
 
     /// Handle a tags request
     pub async fn handle_tags_request<C>(