Move ChecksummedBytes to the object module

Signed-off-by: Alessandro Passaro <[email protected]>
awslabs · May 3, 2024 · fde9b9f · fde9b9f
1 parent fe38142
commit fde9b9f
Show file tree

Hide file tree

Showing 8 changed files with 591 additions and 589 deletions.
diff --git a/mountpoint-s3/src/checksums.rs b/mountpoint-s3/src/checksums.rs
diff --git a/mountpoint-s3/src/data_cache.rs b/mountpoint-s3/src/data_cache.rs
@@ -10,10 +10,10 @@ mod in_memory_data_cache;
 
 use thiserror::Error;
 
-pub use crate::checksums::ChecksummedBytes;
 pub use crate::data_cache::cache_directory::ManagedCacheDir;
 pub use crate::data_cache::disk_data_cache::{CacheLimit, DiskDataCache, DiskDataCacheConfig};
 pub use crate::data_cache::in_memory_data_cache::InMemoryDataCache;
+pub use crate::object::ChecksummedBytes;
 
 use crate::object::ObjectId;
 

diff --git a/mountpoint-s3/src/data_cache/disk_data_cache.rs b/mountpoint-s3/src/data_cache/disk_data_cache.rs
@@ -14,9 +14,8 @@ use sha2::{Digest, Sha256};
 use thiserror::Error;
 use tracing::{trace, warn};
 
-use crate::checksums::IntegrityError;
 use crate::data_cache::DataCacheError;
-use crate::object::ObjectId;
+use crate::object::{IntegrityError, ObjectId};
 use crate::sync::Mutex;
 
 use super::{BlockIndex, ChecksummedBytes, DataCache, DataCacheResult};