Merge branch 'debug' into develop

lib/src/blob/mod.rs

@@ -645,16 +645,24 @@ async fn read_block(
     locator: &Locator,
     read_key: &cipher::SecretKey,
 ) -> Result<(BlockId, BlockContent)> {
-    let (id, _) = tx
+    let (block_id, _) = tx
         .find_block_at(root_node, &locator.encode(read_key))
-        .await?;
+        .await
+        .inspect_err(|error| {
+            tracing::trace!(?error, root_hash = ?root_node.proof.hash, ?locator);
+        })?;
 
     let mut content = BlockContent::new();
-    let nonce = tx.read_block(&id, &mut content).await?;
+    let nonce = tx
+        .read_block(&block_id, &mut content)
+        .await
+        .inspect_err(|error| {
+            tracing::trace!(?error, root_hash = ?root_node.proof.hash, ?locator, ?block_id);
+        })?;
 
     decrypt_block(read_key, &nonce, &mut content);
 
-    Ok((id, content))
+    Ok((block_id, content))
 }
 
 fn write_block(

lib/src/crypto/hash.rs

@@ -273,6 +273,18 @@ where
     }
 }
 
+impl<T> Clone for CacheHash<T>
+where
+    T: Clone,
+{
+    fn clone(&self) -> Self {
+        Self {
+            owner: self.owner.clone(),
+            hash: self.hash,
+        }
+    }
+}
+
 impl<T> Hashable for CacheHash<T>
 where
     T: Hashable,