refactor(store): move create_n0_bao test util into util::tests::create_n0_bao

Author: b5

src/api/blobs/reader.rs

@@ -225,10 +225,11 @@ mod tests {
         protocol::ChunkRangesExt,
         store::{
             fs::{
-                tests::{create_n0_bao, test_data, INTERESTING_SIZES},
+                tests::{test_data, INTERESTING_SIZES},
                 FsStore,
             },
             mem::MemStore,
+            util::tests::create_n0_bao,
         },
     };
 

src/api/remote.rs

@@ -1073,10 +1073,11 @@ mod tests {
         protocol::{ChunkRangesExt, ChunkRangesSeq, GetRequest},
         store::{
             fs::{
-                tests::{create_n0_bao, test_data, INTERESTING_SIZES},
+                tests::{test_data, INTERESTING_SIZES},
                 FsStore,
             },
             mem::MemStore,
+            util::tests::create_n0_bao,
         },
         tests::{add_test_hash_seq, add_test_hash_seq_incomplete},
     };

src/store/fs.rs

@@ -1497,10 +1497,7 @@ pub mod tests {
     use core::panic;
     use std::collections::{HashMap, HashSet};
 
-    use bao_tree::{
-        io::{outboard::PreOrderMemOutboard, round_up_to_chunks_groups},
-        ChunkRanges,
-    };
+    use bao_tree::{io::round_up_to_chunks_groups, ChunkRanges};
     use n0_future::{stream, Stream, StreamExt};
     use testresult::TestResult;
     use walkdir::WalkDir;
@@ -1509,7 +1506,7 @@ pub mod tests {
     use crate::{
         api::blobs::Bitfield,
         store::{
-            util::{read_checksummed, SliceInfoExt, Tag},
+            util::{read_checksummed, tests::create_n0_bao, SliceInfoExt, Tag},
             IROH_BLOCK_SIZE,
         },
     };
@@ -1526,17 +1523,6 @@ pub mod tests {
         1024 * 1024 * 8, // data file, outboard file
     ];
 
-    /// Create n0 flavoured bao. Note that this can be used to request ranges below a chunk group size,
-    /// which can not be exported via bao because we don't store hashes below the chunk group level.
-    pub fn create_n0_bao(data: &[u8], ranges: &ChunkRanges) -> anyhow::Result<(Hash, Vec<u8>)> {
-        let outboard = PreOrderMemOutboard::create(data, IROH_BLOCK_SIZE);
-        let mut encoded = Vec::new();
-        let size = data.len() as u64;
-        encoded.extend_from_slice(&size.to_le_bytes());
-        bao_tree::io::sync::encode_ranges_validated(data, &outboard, ranges, &mut encoded)?;
-        Ok((outboard.root.into(), encoded))
-    }
-
     pub fn round_up_request(size: u64, ranges: &ChunkRanges) -> ChunkRanges {
         let last_chunk = ChunkNum::chunks(size);
         let data_range = ChunkRanges::from(..last_chunk);

src/store/gc.rs

@@ -253,7 +253,7 @@ mod tests {
     use crate::{
         api::{blobs::AddBytesOptions, ExportBaoError, RequestError, Store},
         hashseq::HashSeq,
-        store::fs::{options::PathOptions, tests::create_n0_bao},
+        store::{fs::options::PathOptions, util::tests::create_n0_bao},
         BlobFormat,
     };
 

src/store/util.rs

@@ -404,3 +404,21 @@ impl bao_tree::io::mixed::Sender for BaoTreeSender {
         self.0.send(item).await
     }
 }
+
+#[cfg(test)]
+pub mod tests {
+    use crate::hash::Hash;
+    use crate::store::IROH_BLOCK_SIZE;
+    use bao_tree::{io::outboard::PreOrderMemOutboard, ChunkRanges};
+
+    /// Create n0 flavoured bao. Note that this can be used to request ranges below a chunk group size,
+    /// which can not be exported via bao because we don't store hashes below the chunk group level.
+    pub fn create_n0_bao(data: &[u8], ranges: &ChunkRanges) -> anyhow::Result<(Hash, Vec<u8>)> {
+        let outboard = PreOrderMemOutboard::create(data, IROH_BLOCK_SIZE);
+        let mut encoded = Vec::new();
+        let size = data.len() as u64;
+        encoded.extend_from_slice(&size.to_le_bytes());
+        bao_tree::io::sync::encode_ranges_validated(data, &outboard, ranges, &mut encoded)?;
+        Ok((outboard.root.into(), encoded))
+    }
+}

src/tests.rs

@@ -19,11 +19,11 @@ use crate::{
     provider::events::{AbortReason, EventMask, EventSender, ProviderMessage, RequestUpdate},
     store::{
         fs::{
-            tests::{create_n0_bao, test_data, INTERESTING_SIZES},
+            tests::{test_data, INTERESTING_SIZES},
             FsStore,
         },
         mem::MemStore,
-        util::observer::Combine,
+        util::{observer::Combine, tests::create_n0_bao},
     },
     util::sink::Drain,
     BlobFormat, Hash, HashAndFormat,