Use latest version of irpc

Author: rklaehn

Cargo.lock

@@ -33,8 +33,7 @@ self_cell = "1.1.0"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
 iroh-base = "0.35.0"
 reflink-copy = "0.1.24"
-irpc = { version = "0.4.0", features = ["rpc", "quinn_endpoint_setup", "message_spans", "stream"], default-features = false }
-irpc-derive = { version = "0.4.0", default-features = false }
+irpc = { version = "0.4.0", features = ["rpc", "quinn_endpoint_setup", "message_spans", "stream", "derive"], default-features = false }
 iroh-metrics = { version = "0.32.0" }
 hashlink = "0.10.0"
 futures-buffered = "0.2.11"

Cargo.toml

@@ -11,8 +11,7 @@ use std::{
 use anyhow::bail;
 use genawaiter::sync::Gen;
 use iroh::{Endpoint, NodeId, endpoint::Connection};
-use irpc::channel::mpsc;
-use irpc_derive::rpc_requests;
+use irpc::{channel::mpsc, rpc_requests};
 use n0_future::{BufferedStreamExt, Stream, StreamExt, future, stream};
 use rand::seq::SliceRandom;
 use serde::{Deserialize, Serialize, de::Error};

src/api/downloader.rs

@@ -28,8 +28,10 @@ use bao_tree::{
     io::{BaoContentItem, Leaf, mixed::EncodedItem},
 };
 use bytes::Bytes;
-use irpc::channel::{mpsc, oneshot};
-use irpc_derive::rpc_requests;
+use irpc::{
+    channel::{mpsc, oneshot},
+    rpc_requests,
+};
 use n0_future::Stream;
 use range_collections::RangeSet2;
 use serde::{Deserialize, Serialize};

src/api/proto.rs

@@ -662,7 +662,7 @@ async fn import_byte_stream(
     scope: Scope,
     format: BlobFormat,
     mut rx: mpsc::Receiver<ImportByteStreamUpdate>,
-    mut tx: mpsc::Sender<AddProgressItem>,
+    tx: mpsc::Sender<AddProgressItem>,
 ) -> anyhow::Result<ImportEntry> {
     let mut res = Vec::new();
     loop {
@@ -700,7 +700,7 @@ async fn import_path(cmd: ImportPathMsg) -> anyhow::Result<ImportEntry> {
                 format,
                 ..
             },
-        mut tx,
+        tx,
         ..
     } = cmd;
     let mut res = Vec::new();

src/store/mem.rs

@@ -85,24 +85,24 @@ impl Actor {
                 .await
                 .ok();
             }
-            Command::ImportBytes(ImportBytesMsg { mut tx, .. }) => {
+            Command::ImportBytes(ImportBytesMsg { tx, .. }) => {
                 tx.send(io::Error::other("import not supported").into())
                     .await
                     .ok();
             }
-            Command::ImportByteStream(ImportByteStreamMsg { mut tx, .. }) => {
+            Command::ImportByteStream(ImportByteStreamMsg { tx, .. }) => {
                 tx.send(io::Error::other("import not supported").into())
                     .await
                     .ok();
             }
-            Command::ImportPath(ImportPathMsg { mut tx, .. }) => {
+            Command::ImportPath(ImportPathMsg { tx, .. }) => {
                 tx.send(io::Error::other("import not supported").into())
                     .await
                     .ok();
             }
             Command::Observe(ObserveMsg {
                 inner: ObserveRequest { hash },
-                mut tx,
+                tx,
                 ..
             }) => {
                 let size = self.data.get_mut(&hash).map(|x| x.data.len() as u64);
@@ -162,7 +162,7 @@ impl Actor {
                     .await
                     .ok();
             }
-            Command::ListBlobs(mut cmd) => {
+            Command::ListBlobs(cmd) => {
                 let hashes: Vec<Hash> = self.data.keys().cloned().collect();
                 self.tasks.spawn(async move {
                     for hash in hashes {