Restructure some stuff to reduce feature flags

Author: rklaehn

src/api/blobs.rs

@@ -144,13 +144,16 @@ impl Blobs {
     /// clears the protections before.
     ///
     /// Users should rely only on garbage collection for blob deletion.
+
+    #[allow(dead_code)]
     pub(crate) async fn delete_with_opts(&self, options: DeleteOptions) -> RequestResult<()> {
         trace!("{options:?}");
         self.client.rpc(options).await??;
         Ok(())
     }
 
     /// See [`Self::delete_with_opts`].
+    #[allow(dead_code)]
     pub(crate) async fn delete(
         &self,
         hashes: impl IntoIterator<Item = impl Into<Hash>>,
@@ -510,6 +513,7 @@ impl Blobs {
         }
     }
 
+    #[allow(dead_code)]
     pub(crate) async fn clear_protected(&self) -> RequestResult<()> {
         let msg = ClearProtectedRequest;
         self.client.rpc(msg).await??;

src/api/proto.rs

@@ -40,6 +40,7 @@ pub use bitfield::Bitfield;
 
 use crate::{store::util::Tag, util::temp_tag::TempTag, BlobFormat, Hash, HashAndFormat};
 
+#[allow(dead_code)]
 pub(crate) trait HashSpecific {
     fn hash(&self) -> Hash;
 

src/api/proto/bitfield.rs

@@ -70,6 +70,7 @@ impl<'de> Deserialize<'de> for Bitfield {
 }
 
 impl Bitfield {
+    #[cfg(feature = "fs-store")]
     pub(crate) fn new_unchecked(ranges: ChunkRanges, size: u64) -> Self {
         Self { ranges, size }
     }

src/store/fs.rs

@@ -121,12 +121,13 @@ use crate::{
             util::entity_manager::{self, ActiveEntityState},
         },
         util::{BaoTreeSender, FixedSize, MemOrFile, ValueOrPoisioned},
-        Hash, IROH_BLOCK_SIZE,
+        IROH_BLOCK_SIZE,
     },
     util::{
         channel::oneshot,
         temp_tag::{TagDrop, TempTag, TempTagScope, TempTags},
     },
+    Hash,
 };
 mod bao_file;
 use bao_file::BaoFileHandle;
@@ -142,7 +143,7 @@ use options::Options;
 use tracing::Instrument;
 mod gc;
 
-use super::HashAndFormat;
+use crate::HashAndFormat;
 use crate::api::{
     self,
     blobs::{AddProgressItem, ExportMode, ExportProgressItem},
@@ -1477,7 +1478,7 @@ pub mod tests {
         api::blobs::Bitfield,
         store::{
             util::{read_checksummed, SliceInfoExt, Tag},
-            HashAndFormat, IROH_BLOCK_SIZE,
+            IROH_BLOCK_SIZE,
         },
     };
 

src/store/fs/bao_file.rs

@@ -35,8 +35,9 @@ use crate::{
             read_checksummed_and_truncate, write_checksummed, FixedSize, MemOrFile,
             PartialMemStorage, DD,
         },
-        Hash, IROH_BLOCK_SIZE,
+        IROH_BLOCK_SIZE,
     },
+    Hash,
 };
 
 /// Storage for complete blobs. There is no longer any uncertainty about the

src/store/fs/meta.rs

@@ -26,9 +26,8 @@ use crate::{
             CreateTagRequest, DeleteBlobsMsg, DeleteTagsRequest, ListBlobsMsg, ListRequest,
             ListTagsRequest, RenameTagRequest, SetTagRequest, ShutdownMsg, SyncDbMsg,
         },
-        tags::TagInfo,
-    },
-    util::channel::oneshot,
+        tags::TagInfo, Tag,
+    }, util::channel::oneshot, Hash
 };
 mod proto;
 pub use proto::*;
@@ -43,7 +42,7 @@ use super::{
     util::PeekableReceiver,
     BaoFilePart,
 };
-use crate::store::{util::Tag, Hash, IROH_BLOCK_SIZE};
+use crate::store::IROH_BLOCK_SIZE;
 
 /// Error type for message handler functions of the redb actor.
 ///

src/store/fs/meta/tables.rs

@@ -2,7 +2,8 @@
 use redb::{ReadableTable, TableDefinition, TableError};
 
 use super::EntryState;
-use crate::store::{fs::delete_set::FileTransaction, util::Tag, Hash, HashAndFormat};
+use crate::store::{fs::delete_set::FileTransaction};
+use crate::{Hash, HashAndFormat, api::Tag};
 
 pub(super) const BLOBS_TABLE: TableDefinition<Hash, EntryState> = TableDefinition::new("blobs-0");
 

src/store/mem.rs

@@ -59,8 +59,9 @@ use crate::{
     protocol::ChunkRangesExt,
     store::{
         util::{SizeInfo, SparseMemFile, Tag},
-        HashAndFormat, IROH_BLOCK_SIZE,
+        IROH_BLOCK_SIZE,
     },
+    HashAndFormat,
     util::temp_tag::{TagDrop, TempTagScope, TempTags},
     BlobFormat, Hash,
 };

src/store/mod.rs

@@ -12,7 +12,5 @@ pub mod readonly_mem;
 mod test;
 pub(crate) mod util;
 
-use crate::hash::{Hash, HashAndFormat};
-
 /// Block size used by iroh, 2^4*1024 = 16KiB
 pub const IROH_BLOCK_SIZE: BlockSize = BlockSize::from_chunk_log(4);