refactor: switch to serde_error directly

Cargo.toml

@@ -41,6 +41,7 @@ redb_v1  = { package = "redb", version = "1.5.1", optional = true }
 reflink-copy = { version = "0.1.8", optional = true }
 self_cell = "1.0.1"
 serde = { version = "1", features = ["derive"] }
+serde-error = "0.1.3"
 smallvec = { version = "1.10.0", features = ["serde", "const_new"] }
 tempfile = { version = "3.10.0", optional = true }
 thiserror = "1"
@@ -102,7 +103,7 @@ unused-async = "warn"
 
 [profile.dev-ci]
 inherits = 'dev'
-opt-level = 1 
+opt-level = 1
 
 [profile.optimized-release]
 inherits = 'release'

src/downloader.rs

@@ -796,9 +796,9 @@ impl<G: Getter<Connection = D::Connection>, D: Dialer> Service<G, D> {
             if let Some(sender) = handlers.on_progress {
                 self.progress_tracker.unsubscribe(&kind, &sender);
                 sender
-                    .send(DownloadProgress::Abort(
-                        anyhow::Error::from(DownloadError::Cancelled).into(),
-                    ))
+                    .send(DownloadProgress::Abort(serde_error::Error::new(
+                        &*anyhow::Error::from(DownloadError::Cancelled),
+                    )))
                     .await
                     .ok();
             }

src/export.rs

@@ -4,7 +4,6 @@ use std::path::PathBuf;
 
 use anyhow::Context;
 use bytes::Bytes;
-use iroh_base::rpc::RpcError;
 use serde::{Deserialize, Serialize};
 use tracing::trace;
 
@@ -124,7 +123,7 @@ pub enum ExportProgress {
     /// We are done with the whole operation.
     AllDone,
     /// We got an error and need to abort.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 fn pathbuf_from_name(name: &str) -> PathBuf {

src/get/db.rs

@@ -9,7 +9,7 @@ use genawaiter::{
     rc::{Co, Gen},
     GeneratorState,
 };
-use iroh_base::{hash::Hash, rpc::RpcError};
+use iroh_base::hash::Hash;
 use iroh_io::AsyncSliceReader;
 use iroh_net::endpoint::Connection;
 use serde::{Deserialize, Serialize};
@@ -669,7 +669,7 @@ pub enum DownloadProgress {
     /// We got an error and need to abort.
     ///
     /// This will be the last message in the stream.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// The id of a blob in a transfer

src/provider.rs

@@ -7,7 +7,6 @@ use bao_tree::io::{
     EncodeError,
 };
 use futures_lite::future::Boxed as BoxFuture;
-use iroh_base::rpc::RpcError;
 use iroh_io::{
     stats::{SliceReaderStats, StreamWriterStats, TrackingSliceReader, TrackingStreamWriter},
     AsyncSliceReader, AsyncStreamWriter, TokioStreamWriter,
@@ -157,7 +156,7 @@ pub enum AddProgress {
     /// We got an error and need to abort.
     ///
     /// This will be the last message in the stream.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// Progress updates for the batch add operation.
@@ -181,7 +180,7 @@ pub enum BatchAddPathProgress {
     /// We got an error and need to abort.
     ///
     /// This will be the last message in the stream.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// Read the request from the getter.

src/store/traits.rs

@@ -9,7 +9,6 @@ use bao_tree::{
 use bytes::Bytes;
 use futures_lite::{Stream, StreamExt};
 use genawaiter::rc::{Co, Gen};
-use iroh_base::rpc::RpcError;
 use iroh_io::AsyncSliceReader;
 pub use range_collections;
 use serde::{Deserialize, Serialize};
@@ -877,7 +876,7 @@ pub enum ConsistencyCheckProgress {
     /// Consistency check ended
     Done,
     /// We got an error and need to abort.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// Progress updates for the validate operation
@@ -947,7 +946,7 @@ pub enum ValidateProgress {
     /// We are done with the whole operation.
     AllDone,
     /// We got an error and need to abort.
-    Abort(RpcError),
+    Abort(serde_error::Error),
 }
 
 /// Database events