refactor: use relative standalone compat consumers (#3734)

This commit is contained in:
安正超
2026-06-22 15:07:58 +08:00
committed by GitHub
parent 7d81183cf1
commit cca9e83a8b
19 changed files with 81 additions and 46 deletions
@@ -15,7 +15,7 @@
// Used by test_distributed_lock_4_nodes_grpc in lock.rs
#![allow(dead_code)]
use crate::storage_compat::node_service_time_out_client_no_auth;
use super::super::storage_compat::node_service_time_out_client_no_auth;
use async_trait::async_trait;
use rustfs_lock::{
LockClient, LockError, LockId, LockInfo, LockRequest, LockResponse, LockStats, LockStatus, LockType, Result,
@@ -41,7 +41,10 @@ impl GrpcLockClient {
&self,
) -> Result<
rustfs_protos::proto_gen::node_service::node_service_client::NodeServiceClient<
tonic::service::interceptor::InterceptedService<tonic::transport::Channel, crate::storage_compat::TonicInterceptor>,
tonic::service::interceptor::InterceptedService<
tonic::transport::Channel,
super::super::storage_compat::TonicInterceptor,
>,
>,
> {
node_service_time_out_client_no_auth(&self.addr)
@@ -13,9 +13,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use super::super::storage_compat::{VolumeInfo, WalkDirOptions};
use super::super::storage_compat::{gen_tonic_signature_interceptor, node_service_time_out_client};
use crate::common::workspace_root;
use crate::storage_compat::{VolumeInfo, WalkDirOptions};
use crate::storage_compat::{gen_tonic_signature_interceptor, node_service_time_out_client};
use futures::future::join_all;
use rmp_serde::{Deserializer, Serializer};
use rustfs_filemeta::{MetaCacheEntry, MetacacheReader, MetacacheWriter};
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use super::storage_compat::BucketTargetSys;
use crate::common::{
RustFSTestEnvironment, awscurl_available, awscurl_post_sts_form_urlencoded, init_logging, local_http_client,
};
use crate::storage_compat::BucketTargetSys;
use aws_sdk_s3::config::{Credentials, Region};
use aws_sdk_s3::primitives::ByteStream;
use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};