refactor: route ecstore storage api boundaries (#3892)

crates/ecstore/tests/ecstore_contract_compat_test.rs

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+mod storage_api;
+
 use rustfs_common::heal_channel::HealOpts;
-use rustfs_ecstore::api::object::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
-use rustfs_ecstore::api::{disk::DiskStore, error::Error, storage::ECStore};
 use rustfs_filemeta::FileInfo;
 use rustfs_lock::NamespaceLockWrapper;
 use rustfs_madmin::heal_commands::HealResultItem;
-use rustfs_storage_api::{
-    CompletePart, DeletedObject, HTTPRangeSpec, HealOperations as StorageHealOperations, ListMultipartsInfo,
-    ListObjectVersionsInfo as StorageListObjectVersionsInfo, ListObjectsV2Info as StorageListObjectsV2Info, ListPartsInfo,
-    MultipartInfo, MultipartOperations as StorageMultipartOperations, MultipartUploadResult,
-    NamespaceLocking as StorageNamespaceLocking, ObjectIO as StorageObjectIO, ObjectInfoOrErr as StorageObjectInfoOrErr,
-    ObjectOperations as StorageObjectOperations, ObjectToDelete, PartInfo, StorageAdminApi, WalkOptions as StorageWalkOptions,
+use storage_api::{
+    CompletePart, DeletedObject, DiskStore, ECStore, Error, GetObjectReader, HTTPRangeSpec, ListMultipartsInfo, ListPartsInfo,
+    MultipartInfo, MultipartUploadResult, ObjectInfo, ObjectOptions, ObjectToDelete, PartInfo, PutObjReader, StorageAdminApi,
+    StorageHealOperations, StorageListObjectVersionsInfo, StorageListObjectsV2Info, StorageListOperations,
+    StorageMultipartOperations, StorageNamespaceLocking, StorageObjectIO, StorageObjectInfoOrErr, StorageObjectOperations,
+    StorageWalkOptions,
 };
 use tokio_util::sync::CancellationToken;
 
@@ -82,7 +82,7 @@ where
 
 fn storage_list_operations_type_name<T>() -> &'static str
 where
-    T: rustfs_storage_api::ListOperations<
+    T: StorageListOperations<
             Error = Error,
             ListObjectsV2Info = ListObjectsV2Info,
             ListObjectVersionsInfo = ListObjectVersionsInfo,

crates/ecstore/tests/legacy_bitrot_read_test.rs

@@ -27,12 +27,12 @@
 //!
 //! For MinIO data: RUSTFS_LEGACY_TEST_ROOT=/path/to/minio (disk "test" and .minio.sys auto-detected).
 
-use rustfs_ecstore::api::bitrot::create_bitrot_reader;
-use rustfs_ecstore::api::disk::endpoint::Endpoint;
-use rustfs_ecstore::api::disk::{DiskOption, STORAGE_FORMAT_FILE, new_disk};
+mod storage_api;
+
 use rustfs_filemeta::{FileInfoOpts, get_file_info};
 use rustfs_utils::HashAlgorithm;
 use std::path::PathBuf;
+use storage_api::{DiskOption, Endpoint, STORAGE_FORMAT_FILE, create_bitrot_reader, new_disk};
 use tokio::fs;
 
 fn workspace_root() -> PathBuf {

crates/ecstore/tests/minio_generated_read_test.rs

@@ -4,14 +4,14 @@ use std::fs;
 use std::io::Cursor;
 use std::path::{Path, PathBuf};
 
-use rustfs_ecstore::api::bitrot::create_bitrot_reader;
-use rustfs_ecstore::api::disk::endpoint::Endpoint;
-use rustfs_ecstore::api::disk::{DiskAPI as _, DiskOption, new_disk};
-use rustfs_ecstore::api::erasure::Erasure;
-use rustfs_ecstore::api::object::{GetObjectReader, ObjectInfo, ObjectOptions};
+mod storage_api;
+
 use rustfs_filemeta::{FileInfo, FileInfoOpts, get_file_info};
 use serde::Deserialize;
 use sha2::{Digest, Sha256};
+use storage_api::{
+    DiskAPI as _, DiskOption, Endpoint, Erasure, GetObjectReader, ObjectInfo, ObjectOptions, create_bitrot_reader, new_disk,
+};
 use temp_env::async_with_vars;
 use tokio::io::{AsyncReadExt, AsyncWrite};
 

crates/ecstore/tests/storage_api.rs

@@ -0,0 +1,15 @@
+#![allow(unused_imports)]
+
+pub(crate) use rustfs_ecstore::api::bitrot::create_bitrot_reader;
+pub(crate) use rustfs_ecstore::api::disk::{DiskAPI, DiskOption, DiskStore, STORAGE_FORMAT_FILE, endpoint::Endpoint, new_disk};
+pub(crate) use rustfs_ecstore::api::erasure::Erasure;
+pub(crate) use rustfs_ecstore::api::object::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
+pub(crate) use rustfs_ecstore::api::{error::Error, storage::ECStore};
+pub(crate) use rustfs_storage_api::{
+    CompletePart, DeletedObject, HTTPRangeSpec, HealOperations as StorageHealOperations, ListMultipartsInfo,
+    ListObjectVersionsInfo as StorageListObjectVersionsInfo, ListObjectsV2Info as StorageListObjectsV2Info,
+    ListOperations as StorageListOperations, ListPartsInfo, MultipartInfo, MultipartOperations as StorageMultipartOperations,
+    MultipartUploadResult, NamespaceLocking as StorageNamespaceLocking, ObjectIO as StorageObjectIO,
+    ObjectInfoOrErr as StorageObjectInfoOrErr, ObjectOperations as StorageObjectOperations, ObjectToDelete, PartInfo,
+    StorageAdminApi, WalkOptions as StorageWalkOptions,
+};