refactor!: remove iroh_base::rpc

Cargo.toml

@@ -51,3 +51,5 @@ iroh-net = { path = "./iroh-net" }
 iroh-metrics = { path = "./iroh-metrics" }
 iroh-test = { path = "./iroh-test" }
 iroh-router = { path = "./iroh-router" }
+
+iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "main" }

deny.toml

@@ -34,3 +34,8 @@ license-files = [
 ignore = [
       "RUSTSEC-2024-0370", # unmaintained, no upgrade available
 ]
+
+[sources]
+allow-git = [
+    "https://github.com/n0-computer/iroh-blobs.git",
+]

iroh-base/Cargo.toml

@@ -22,7 +22,6 @@ hex = "0.4.3"
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"], optional = true }
 redb = { version = "2.0.0", optional = true }
 serde = { version = "1", features = ["derive"] }
-serde-error = "0.1.2"
 thiserror = "1"
 
 # key module

iroh-base/src/lib.rs

@@ -13,7 +13,6 @@ pub mod key;
 #[cfg(feature = "key")]
 #[cfg_attr(iroh_docsrs, doc(cfg(feature = "key")))]
 pub mod node_addr;
-pub mod rpc;
 #[cfg(feature = "base32")]
 #[cfg_attr(iroh_docsrs, doc(cfg(feature = "base32")))]
 pub mod ticket;

iroh/Cargo.toml

@@ -61,6 +61,7 @@ console = { version = "0.15.5", optional = true }
 
 # Documentation tests
 url = { version = "2.5.0", features = ["serde"] }
+serde-error = "0.1.3"
 
 [features]
 default = ["metrics", "fs-store"]

iroh/src/client/docs.rs

@@ -15,7 +15,7 @@ use anyhow::{anyhow, Context as _, Result};
 use bytes::Bytes;
 use derive_more::{Display, FromStr};
 use futures_lite::{Stream, StreamExt};
-use iroh_base::{key::PublicKey, node_addr::AddrInfoOptions, rpc::RpcError};
+use iroh_base::{key::PublicKey, node_addr::AddrInfoOptions};
 use iroh_blobs::{export::ExportProgress, store::ExportMode, Hash};
 #[doc(inline)]
 pub use iroh_docs::engine::{Origin, SyncEvent, SyncReason};
@@ -527,7 +527,7 @@ pub enum ImportProgress {
     /// We got an error and need to abort.
     ///
     /// This will be the last message in the stream.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// Intended capability for document share tickets

iroh/src/node.rs

@@ -73,6 +73,7 @@ mod protocol;
 mod rpc;
 mod rpc_status;
 
+pub(crate) use self::rpc::{RpcError, RpcResult};
 pub use self::{
     builder::{
         Builder, DiscoveryConfig, DocsStorage, GcPolicy, ProtocolBuilder, StorageConfig,