Merge remote-tracking branch 'origin/main' into refactor-futures

iroh-base/src/hash.rs

@@ -7,7 +7,7 @@ use bao_tree::blake3;
 use postcard::experimental::max_size::MaxSize;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
-use crate::base32::{parse_array_hex_or_base32, HexOrBase32ParseError};
+use crate::base32::{self, parse_array_hex_or_base32, HexOrBase32ParseError};
 
 /// Hash type used throughout.
 #[derive(PartialEq, Eq, Copy, Clone, Hash)]
@@ -54,6 +54,12 @@ impl Hash {
     pub fn to_hex(&self) -> String {
         self.0.to_hex().to_string()
     }
+
+    /// Convert to a base32 string limited to the first 10 bytes for a friendly string
+    /// representation of the hash.
+    pub fn fmt_short(&self) -> String {
+        base32::fmt_short(self.as_bytes())
+    }
 }
 
 impl AsRef<[u8]> for Hash {
@@ -173,7 +179,18 @@ impl MaxSize for Hash {
 
 /// A format identifier
 #[derive(
-    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default, Debug, MaxSize,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Serialize,
+    Deserialize,
+    Default,
+    Debug,
+    MaxSize,
+    Hash,
 )]
 pub enum BlobFormat {
     /// Raw blob
@@ -205,7 +222,7 @@ impl BlobFormat {
 }
 
 /// A hash and format pair
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, MaxSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, MaxSize, Hash)]
 pub struct HashAndFormat {
     /// The hash
     pub hash: Hash,
@@ -289,6 +306,11 @@ mod redb_support {
 }
 
 impl HashAndFormat {
+    /// Create a new hash and format pair.
+    pub fn new(hash: Hash, format: BlobFormat) -> Self {
+        Self { hash, format }
+    }
+
     /// Create a new hash and format pair, using the default (raw) format.
     pub fn raw(hash: Hash) -> Self {
         Self {

iroh-bytes/Cargo.toml

@@ -25,6 +25,7 @@ flume = "0.11"
 futures-buffered = "0.2.4"
 futures-lite = "2.3"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
+hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
 iroh-base = { version = "0.14.0", features = ["redb"], path = "../iroh-base" }
 iroh-io = { version = "0.6.0", features = ["stats"] }
@@ -51,6 +52,7 @@ tracing-futures = "0.2.5"
 
 [dev-dependencies]
 http-body = "0.4.5"
+iroh-bytes = { path = ".", features = ["downloader"] }
 iroh-test = { path = "../iroh-test" }
 futures-buffered = "0.2.4"
 proptest = "1.0.0"
@@ -59,13 +61,14 @@ serde_test = "1.0.176"
 tokio = { version = "1", features = ["macros", "test-util"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 rcgen = "0.12.0"
-rustls = { version = "0.21.0", default-features = false, features = ["quic"] }
+rustls = { version = "0.21.11", default-features = false, features = ["quic"] }
 tempfile = "3.10.0"
+futures-util = "0.3.30"
 
 [features]
 default = ["fs-store"]
+downloader = ["dep:iroh-net", "dep:parking_lot", "tokio-util/time", "dep:hashlink"]
 fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
-downloader = ["dep:iroh-net", "dep:parking_lot", "tokio-util/time"]
 metrics = ["dep:iroh-metrics"]
 redb = ["dep:redb"]