more shorter imports

Author: rklaehn

iroh-cli/src/commands/blobs.rs

@@ -21,16 +21,18 @@ use iroh::{
         get::{db::DownloadProgress, progress::BlobProgress, Stats},
         net_protocol::DownloadMode,
         provider::AddProgress,
-        rpc::client::blobs::{
-            BlobInfo, BlobStatus, CollectionInfo, DownloadOptions, IncompleteBlobInfo, WrapOption,
-        },
         store::{
             ConsistencyCheckProgress, ExportFormat, ExportMode, ReportLevel, ValidateProgress,
         },
         util::SetTagOption,
         BlobFormat, Hash, HashAndFormat, Tag,
     },
-    client::Iroh,
+    client::{
+        blobs::{
+            BlobInfo, BlobStatus, CollectionInfo, DownloadOptions, IncompleteBlobInfo, WrapOption,
+        },
+        Iroh,
+    },
     net::{key::PublicKey, relay::RelayUrl, NodeAddr},
 };
 use tokio::io::AsyncWriteExt;

iroh-cli/src/commands/docs.rs

@@ -17,7 +17,8 @@ use futures_lite::{Stream, StreamExt};
 use indicatif::{HumanBytes, HumanDuration, MultiProgress, ProgressBar, ProgressStyle};
 use iroh::{
     base::{base32::fmt_short, node_addr::AddrInfoOptions},
-    blobs::{provider::AddProgress, rpc::client::blobs::WrapOption, util::SetTagOption, Hash, Tag},
+    blobs::{provider::AddProgress, util::SetTagOption, Hash, Tag},
+    client::blobs::WrapOption,
     client::{
         docs::{Doc, Entry, LiveEvent, Origin, ShareMode},
         Iroh,

iroh/src/client/blobs.rs

@@ -8,6 +8,7 @@ pub type Client =
     iroh_blobs::rpc::client::blobs::Client<BoxedServiceConnection<RpcService>, RpcService>;
 
 pub use iroh_blobs::rpc::client::blobs::{
-    AddDirOpts, AddFileOpts, AddOutcome, AddProgress, AddReaderOpts, BlobInfo, DownloadMode,
-    DownloadOptions, DownloadOutcome, DownloadProgress, IncompleteBlobInfo, Reader, WrapOption,
+    AddDirOpts, AddFileOpts, AddOutcome, AddProgress, AddReaderOpts, BlobInfo, BlobStatus,
+    CollectionInfo, DownloadMode, DownloadOptions, DownloadOutcome, DownloadProgress,
+    IncompleteBlobInfo, Reader, WrapOption,
 };

iroh/src/client/docs.rs

@@ -487,7 +487,7 @@ impl Entry {
         let client: RpcClient = client.into().clone();
         let client: quic_rpc::RpcClient<iroh_blobs::rpc::proto::RpcService, _, _> = client.map();
 
-        iroh_blobs::rpc::client::blobs::Reader::from_rpc_read(&client, self.content_hash())
+        blobs::Reader::from_rpc_read(&client, self.content_hash())
             .await?
             .read_to_bytes()
             .await

iroh/src/node.rs

@@ -495,15 +495,11 @@ fn node_address_for_storage(info: RemoteInfo) -> Option<NodeAddr> {
 
 #[cfg(test)]
 mod tests {
+    use crate::client::blobs::{AddOutcome, WrapOption};
     use anyhow::{bail, Context};
     use bytes::Bytes;
     use iroh_base::{node_addr::AddrInfoOptions, ticket::BlobTicket};
-    use iroh_blobs::{
-        provider::AddProgress,
-        rpc::client::blobs::{AddOutcome, WrapOption},
-        util::SetTagOption,
-        BlobFormat,
-    };
+    use iroh_blobs::{provider::AddProgress, util::SetTagOption, BlobFormat};
     use iroh_net::{key::SecretKey, relay::RelayMode, test_utils::DnsPkarrServer, NodeAddr};
 
     use super::*;

iroh/src/util/fs.rs

@@ -7,11 +7,12 @@ use std::{
 
 use anyhow::{bail, Context};
 use bytes::Bytes;
-use iroh_blobs::rpc::client::blobs::WrapOption;
 use iroh_net::key::SecretKey;
 use tokio::io::AsyncWriteExt;
 use walkdir::WalkDir;
 
+use crate::client::blobs::WrapOption;
+
 /// A data source
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub struct DataSource {

iroh/tests/batch.rs

@@ -3,11 +3,9 @@ use std::{io, time::Duration};
 use bao_tree::blake3;
 use bytes::Bytes;
 use futures_lite::StreamExt;
+use iroh::client::blobs::{AddDirOpts, WrapOption};
 use iroh::node::GcPolicy;
-use iroh_blobs::{
-    rpc::client::blobs::{AddDirOpts, WrapOption},
-    store::mem::Store,
-};
+use iroh_blobs::store::mem::Store;
 
 async fn create_node() -> anyhow::Result<(iroh::node::Node<Store>, async_channel::Receiver<()>)> {
     let (gc_send, gc_recv) = async_channel::unbounded();