From 1627e6c06b508450eb2724089291abea6f01b522 Mon Sep 17 00:00:00 2001 From: WenyXu Date: Mon, 12 Oct 2026 13:11:23 +0000 Subject: [PATCH] style: use imported types in region request tests Signed-off-by: WenyXu --- src/client/src/region.rs | 12 ++++++------ src/mito2/src/error.rs | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/client/src/region.rs b/src/client/src/region.rs index b1df593bb13..47c477b06b0 100644 --- a/src/client/src/region.rs +++ b/src/client/src/region.rs @@ -655,7 +655,7 @@ mod tests { let error = requester.handle(Arc::clone(&shared)).await.unwrap_err(); assert_eq!(error.retry_hint(), RetryHint::Retryable); assert!( - matches!(error, error::Error::RegionServer { addr, code: tonic::Code::Unavailable, .. } if addr == server.addr) + matches!(error, Error::RegionServer { addr, code: tonic::Code::Unavailable, .. } if addr == server.addr) ); requester.handle(Arc::clone(&shared)).await.unwrap(); let requests = server.service.requests.lock().unwrap(); @@ -699,7 +699,7 @@ mod tests { hint.parse().unwrap(), ); } - let error: error::Error = status.into(); + let error: Error = status.into(); assert_eq!(error.retry_hint(), expected_hint, "{name}"); assert_eq!(error.status_code(), StatusCode::RegionNotReady, "{name}"); assert_eq!( @@ -743,7 +743,7 @@ mod tests { )) .await .unwrap(); - let baseline: error::Error = baseline + let baseline: Error = baseline .handle(build_insert_request()) .await .unwrap_err() @@ -792,11 +792,11 @@ mod tests { let shared = Arc::new(build_insert_request()); assert!(matches!( requester.handle(Arc::clone(&shared)).await.unwrap_err(), - error::Error::IllegalDatabaseResponse { .. } + Error::IllegalDatabaseResponse { .. } )); assert!(matches!( requester.handle(shared).await.unwrap_err(), - error::Error::Server { + Error::Server { code: StatusCode::RegionNotFound, .. } @@ -822,7 +822,7 @@ mod tests { .unwrap() .max_encoding_message_size(config.max_send_message_size.as_bytes() as usize) .max_decoding_message_size(config.max_recv_message_size.as_bytes() as usize); - let baseline: error::Error = baseline + let baseline: Error = baseline .handle(build_insert_request()) .await .unwrap_err() diff --git a/src/mito2/src/error.rs b/src/mito2/src/error.rs index e3fc49a1af9..5af4b7cec09 100644 --- a/src/mito2/src/error.rs +++ b/src/mito2/src/error.rs @@ -1734,6 +1734,7 @@ mod tests { use snafu::IntoError; use super::*; + use crate::region::RegionLeaderState; #[test] fn test_partition_version_mismatch_retry_hint() { @@ -1750,7 +1751,7 @@ mod tests { #[test] fn test_region_state_retry_hint() { let region_id = RegionId::new(1, 1); - let writable = RegionRoleState::Leader(crate::region::RegionLeaderState::Writable); + let writable = RegionRoleState::Leader(RegionLeaderState::Writable); let follower_error = RegionStateSnafu { region_id, state: RegionRoleState::Follower,