fix tests

Signed-off-by: Dave Grantham <[email protected]>

Author: dhuseby

Cargo.toml

@@ -47,6 +47,7 @@ serde = { version = "1.0.219", default-features = false, features = ["alloc", "d
 serde_cbor = { version = "0.11.2", features = ["tags"]}
 serde_json = { version = "1.0.104"}
 serde_test = { version = "1.0.104"}
+test-log = { version = "0.2.17", features = ["trace", "color"] }
 thiserror = "2.0.12"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

crates/multibase/Cargo.toml

@@ -17,6 +17,8 @@ base-x = { version = "0.2.11", default-features = false }
 base256emoji = "1.0.2"
 data-encoding = { version = "2.9.0", default-features = false, features = ["alloc"] }
 data-encoding-macro = "0.1.18"
+test-log.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 criterion = "0.5.1"

crates/multibase/tests/lib.rs

@@ -1,4 +1,6 @@
 use multibase::{decode, encode, Base, Base::*};
+use test_log::test;
+use tracing::{span, Level};
 
 fn encode_decode_assert(input: &[u8], test_cases: Vec<(Base, &str)>) {
     for (base, output) in test_cases {
@@ -9,18 +11,21 @@ fn encode_decode_assert(input: &[u8], test_cases: Vec<(Base, &str)>) {
 
 #[test]
 fn test_bases_code() {
+    let _ = span!(Level::INFO, "test_bases_code").entered();
     assert_eq!(Identity.code(), '\x00');
     assert_eq!(Base2.code(), '0');
 }
 
 #[test]
 fn test_bases_from_code() {
+    let _ = span!(Level::INFO, "test_bases_from_code").entered();
     assert_eq!(Base::from_code('\x00').unwrap(), Identity);
     assert_eq!(Base::from_code('0').unwrap(), Base2);
 }
 
 #[test]
 fn test_round_trip() {
+    let _ = span!(Level::INFO, "test_round_trip").entered();
     let test_cases: &[&str] = &[
         "helloworld",
         "we all want decentralization",
@@ -36,6 +41,7 @@ fn test_round_trip() {
 
 #[test]
 fn test_basic() {
+    let _ = span!(Level::INFO, "test_basic").entered();
     let input = b"yes mani !";
     let test_cases = vec![
         (Identity, "\x00yes mani !"),
@@ -71,6 +77,7 @@ fn test_basic() {
 
 #[test]
 fn preserves_leading_zero() {
+    let _ = span!(Level::INFO, "preserves_leading_zero").entered();
     let input = b"\x00yes mani !";
     let test_cases = vec![
         (Identity, "\x00\x00yes mani !"),
@@ -103,6 +110,7 @@ fn preserves_leading_zero() {
 
 #[test]
 fn preserves_two_leading_zeroes() {
+    let _ = span!(Level::INFO, "preserves_two_leading_zeroes").entered();
     let input = b"\x00\x00yes mani !";
     let test_cases = vec![
         (Identity, "\x00\x00\x00yes mani !"),
@@ -135,6 +143,7 @@ fn preserves_two_leading_zeroes() {
 
 #[test]
 fn case_insensitivity() {
+    let _ = span!(Level::INFO, "case_insensitivity").entered();
     let input = b"hello world";
     let test_cases = vec![
         (Base16Lower, "f68656c6c6f20776F726C64"),

crates/multicid/Cargo.toml

@@ -24,7 +24,9 @@ rand_core_6.workspace = true
 rng.workspace = true
 serde = { workspace = true, optional = true }
 serde_cbor = { workspace = true, optional = true }
+test-log.workspace = true
 thiserror.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 hex.workspace = true

crates/multicid/src/cid.rs

@@ -210,8 +210,7 @@ impl Builder {
             return Err(CidError::LegacyCid.into());
         }
         Ok(EncodedCid::new(
-            self.base_encoding
-                .unwrap_or_else(Cid::preferred_encoding),
+            self.base_encoding.unwrap_or_else(Cid::preferred_encoding),
             self.try_build()?,
         ))
     }
@@ -240,9 +239,12 @@ impl Builder {
 mod tests {
     use super::*;
     use multihash::mh;
+    use test_log::test;
+    use tracing::{span, Level};
 
     #[test]
     fn test_default() {
+        let _ = span!(Level::INFO, "test_default").entered();
         let v1 = Cid::default();
         assert_eq!(Codec::Cidv1, v1.codec());
         assert_eq!(Codec::DagCbor, v1.target_codec);
@@ -251,6 +253,7 @@ mod tests {
 
     #[test]
     fn test_v0() {
+        let _ = span!(Level::INFO, "test_v0").entered();
         let v0 = Builder::default()
             .with_hash(
                 &mh::Builder::new_from_bytes(Codec::Sha2256, b"for great justice, move every zig!")
@@ -268,24 +271,31 @@ mod tests {
 
     #[test]
     fn test_unknown_decode() {
+        let _ = span!(Level::INFO, "test_unknown_decode").entered();
         // this does not assume it is a legacy v0 encoded CID
         let v0_1 = EncodedCid::try_from("Qmdb16CztyugMSs5anEPrJ6bLeo39bTGcM13zNPqjqUidT").unwrap();
         assert_eq!(Codec::Identity, v0_1.codec());
         assert_eq!(Codec::DagPb, v0_1.target_codec);
         assert_eq!(Codec::Sha2256, v0_1.hash.codec());
 
         // this does not assume a multibase encoded CID
-        let v0_2 = EncodedCid::try_from("bafybeihcrr5owouhnms63areolshu2lp4jjbjqlhf4exegk7tnso5ja6py").unwrap();
+        let v0_2 =
+            EncodedCid::try_from("bafybeihcrr5owouhnms63areolshu2lp4jjbjqlhf4exegk7tnso5ja6py")
+                .unwrap();
         assert_eq!(Codec::Cidv1, v0_2.codec());
         assert_eq!(Codec::DagPb, v0_2.target_codec);
         assert_eq!(Codec::Sha2256, v0_2.hash.codec());
 
-        let v0_3 = EncodedCid::try_from("f01701220e28c7aeb3a876b25ed822472e47a696fe25214c1672f0972195f9b64eea41e7e").unwrap();
+        let v0_3 = EncodedCid::try_from(
+            "f01701220e28c7aeb3a876b25ed822472e47a696fe25214c1672f0972195f9b64eea41e7e",
+        )
+        .unwrap();
         assert_eq!(Codec::Cidv1, v0_3.codec());
         assert_eq!(Codec::DagPb, v0_3.target_codec);
         assert_eq!(Codec::Sha2256, v0_3.hash.codec());
 
-        let v0_4 = EncodedCid::try_from("uAXASIOKMeus6h2sl7YIkcuR6aW_iUhTBZy8Jchlfm2TupB5-").unwrap();
+        let v0_4 =
+            EncodedCid::try_from("uAXASIOKMeus6h2sl7YIkcuR6aW_iUhTBZy8Jchlfm2TupB5-").unwrap();
         assert_eq!(Codec::Cidv1, v0_4.codec());
         assert_eq!(Codec::DagPb, v0_4.target_codec);
         assert_eq!(Codec::Sha2256, v0_4.hash.codec());
@@ -303,6 +313,7 @@ mod tests {
 
     #[test]
     fn test_v0_binary_roundtrip() {
+        let _ = span!(Level::INFO, "test_v0_binary_roundtrip").entered();
         let v0 = Builder::default()
             .with_hash(
                 &mh::Builder::new_from_bytes(Codec::Sha2256, b"for great justice, move every zig!")
@@ -318,6 +329,7 @@ mod tests {
 
     #[test]
     fn test_v0_encoded_roundtrip() {
+        let _ = span!(Level::INFO, "test_v0_encoded_roundtrip").entered();
         let v0 = Builder::default()
             .with_hash(
                 &mh::Builder::new_from_bytes(Codec::Sha2256, b"for great justice, move every zig!")
@@ -334,6 +346,7 @@ mod tests {
 
     #[test]
     fn test_v1() {
+        let _ = span!(Level::INFO, "test_v1").entered();
         let v1 = Builder::new(Codec::Cidv1)
             .with_target_codec(Codec::DagCbor)
             .with_hash(
@@ -352,6 +365,7 @@ mod tests {
 
     #[test]
     fn test_v1_binary_roundtrip() {
+        let _ = span!(Level::INFO, "test_v1_binary_roundtrip").entered();
         let v1 = Builder::new(Codec::Cidv1)
             .with_target_codec(Codec::DagCbor)
             .with_hash(
@@ -368,6 +382,7 @@ mod tests {
 
     #[test]
     fn test_v1_encoded_roundtrip() {
+        let _ = span!(Level::INFO, "test_v1_encoded_roundtrip").entered();
         let v1 = Builder::new(Codec::Cidv1)
             .with_target_codec(Codec::DagCbor)
             .with_base_encoding(Base::Base32Lower)
@@ -386,6 +401,7 @@ mod tests {
 
     #[test]
     fn test_null() {
+        let _ = span!(Level::INFO, "test_null").entered();
         let cid1 = Cid::null();
         assert!(cid1.is_null());
         let cid2 = Cid::default();