chore: Add tracing to update_have_cids

wnfs-wg · Jan 1, 2024 · 7310ed2 · 7310ed2
1 parent 190e6a9
commit 7310ed2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/car-mirror/src/common.rs b/car-mirror/src/common.rs
@@ -470,7 +470,6 @@ impl Default for Config {
     }
 }
 
-#[cfg(fuckoff)]
 #[cfg(test)]
 mod tests {
     use super::*;

diff --git a/car-mirror/src/incremental_verification.rs b/car-mirror/src/incremental_verification.rs
@@ -54,7 +54,7 @@ impl IncrementalDagVerification {
         Ok(this)
     }
 
-    #[instrument(level = "trace", skip_all, fields(num_want = self.want_cids.len(), num_have = self.have_cids.len()))]
+    #[instrument(level = "trace", skip_all)]
     async fn update_have_cids(
         &mut self,
         store: &impl BlockStore,
@@ -68,6 +68,7 @@ impl IncrementalDagVerification {
                     if let Some(BlockStoreError::CIDNotFound(not_found)) =
                         e.downcast_ref::<BlockStoreError>()
                     {
+                        tracing::trace!(%not_found, "Missing block, adding to want list");
                         self.want_cids.insert(*not_found);
                     } else {
                         return Err(Error::BlockStoreError(e));
@@ -84,6 +85,12 @@ impl IncrementalDagVerification {
             }
         }
 
+        tracing::debug!(
+            num_want = self.want_cids.len(),
+            num_have = self.have_cids.len(),
+            "Finished dag verification"
+        );
+
         Ok(())
     }
 

diff --git a/car-mirror/src/pull.rs b/car-mirror/src/pull.rs
@@ -54,13 +54,13 @@ mod tests {
     use futures::TryStreamExt;
     use libipld::Cid;
     use std::collections::HashSet;
-    use wnfs_common::MemoryBlockStore;
+    use wnfs_common::{BlockStore, MemoryBlockStore};
 
     pub(crate) async fn simulate_protocol(
         root: Cid,
         config: &Config,
-        client_store: &MemoryBlockStore,
-        server_store: &MemoryBlockStore,
+        client_store: &impl BlockStore,
+        server_store: &impl BlockStore,
     ) -> Result<Vec<Metrics>> {
         let mut metrics = Vec::new();
         let mut request = crate::pull::request(root, None, config, client_store, &NoCache).await?;

diff --git a/car-mirror/src/push.rs b/car-mirror/src/push.rs
@@ -64,13 +64,13 @@ mod tests {
     use libipld::Cid;
     use proptest::collection::vec;
     use std::collections::HashSet;
-    use wnfs_common::MemoryBlockStore;
+    use wnfs_common::{BlockStore, MemoryBlockStore};
 
     pub(crate) async fn simulate_protocol(
         root: Cid,
         config: &Config,
-        client_store: &MemoryBlockStore,
-        server_store: &MemoryBlockStore,
+        client_store: &impl BlockStore,
+        server_store: &impl BlockStore,
     ) -> Result<Vec<Metrics>> {
         let mut metrics = Vec::new();
         let mut request = crate::push::request(root, None, config, client_store, &NoCache).await?;

diff --git a/car-mirror/src/test_utils/local_utils.rs b/car-mirror/src/test_utils/local_utils.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use futures::TryStreamExt;
 use libipld::{Cid, Ipld};
 use proptest::strategy::Strategy;
-use wnfs_common::{BlockStore, MemoryBlockStore};
+use wnfs_common::{utils::CondSync, BlockStore, MemoryBlockStore};
 
 #[derive(Clone, Debug)]
 pub(crate) struct Metrics {
@@ -92,4 +92,4 @@ pub(crate) async fn total_dag_blocks(root: Cid, store: &impl BlockStore) -> Resu
         .len())
 }
 
-pub(crate) fn assert_send_sync<T: Send + Sync>(fut: fn() -> T) {}
+pub(crate) fn assert_cond_send_sync<T: CondSync>(fut: fn() -> T) {}