refactor: modify modules' name to meet the clippy lint

Signed-off-by: Phoeniix Zhao <[email protected]>

crates/benchmark/src/runner.rs

@@ -19,7 +19,7 @@ use tokio::{
     time::{Duration, Instant},
 };
 use tracing::debug;
-use utils::config::client_config::ClientConfig;
+use utils::config::client::ClientConfig;
 use xline_client::{types::kv::PutRequest, ClientOptions};
 
 use crate::{args::Commands, bench_client::BenchClient, Benchmark};

crates/curp-test-utils/src/test_cmd.rs

@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::{sync::mpsc, time::sleep};
 use tracing::debug;
-use utils::config::engine_config::EngineConfig;
+use utils::config::engine::EngineConfig;
 
 use crate::{META_TABLE, REVISION_TABLE, TEST_TABLE};
 

crates/curp/src/client/mod.rs

@@ -32,7 +32,7 @@ use tonic::transport::ClientTlsConfig;
 use tracing::debug;
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
-use utils::{build_endpoint, config::client_config::ClientConfig};
+use utils::{build_endpoint, config::client::ClientConfig};
 
 use self::{
     retry::{Retry, RetryConfig},

crates/curp/src/server/cmd_worker/mod.rs

@@ -422,7 +422,7 @@ mod tests {
     use test_macros::abort_on_panic;
     use tokio::{sync::mpsc, time::Instant};
     use tracing_test::traced_test;
-    use utils::config::engine_config::EngineConfig;
+    use utils::config::engine::EngineConfig;
 
     use super::*;
     use crate::{log_entry::LogEntry, rpc::ProposeId};

crates/curp/src/server/curp_node.rs

@@ -21,7 +21,7 @@ use tracing::{debug, error, info, trace, warn};
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
 use utils::{
-    config::curp_config::CurpConfig,
+    config::curp::CurpConfig,
     task_manager::{tasks::TaskName, Listener, State, TaskManager},
 };
 

crates/curp/src/server/mod.rs

@@ -7,7 +7,7 @@ use tonic::transport::ClientTlsConfig;
 use tracing::instrument;
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
-use utils::{config::curp_config::CurpConfig, task_manager::TaskManager, tracing::Extract};
+use utils::{config::curp::CurpConfig, task_manager::TaskManager, tracing::Extract};
 
 use self::curp_node::CurpNode;
 pub use self::{

crates/curp/src/server/raw_curp/log.rs

@@ -455,7 +455,7 @@ mod tests {
     use std::{iter::repeat, ops::Index, sync::Arc};
 
     use curp_test_utils::test_cmd::TestCommand;
-    use utils::config::curp_config::{default_batch_max_size, default_log_entries_cap};
+    use utils::config::curp::{default_batch_max_size, default_log_entries_cap};
 
     use super::*;
 

crates/curp/src/server/raw_curp/mod.rs

@@ -37,7 +37,7 @@ use tracing::{
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
 use utils::{
-    config::curp_config::CurpConfig,
+    config::curp::CurpConfig,
     parking_lot_lock::{MutexMap, RwLockMap},
     task_manager::TaskManager,
 };

crates/curp/src/server/raw_curp/tests.rs

@@ -7,7 +7,7 @@ use tokio::{
     time::{sleep, Instant},
 };
 use tracing_test::traced_test;
-use utils::config::curp_config::{
+use utils::config::curp::{
     default_candidate_timeout_ticks, default_follower_timeout_ticks, default_heartbeat_interval,
     CurpConfigBuilder,
 };

crates/curp/src/server/storage/db.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use async_trait::async_trait;
 use engine::{Engine, EngineType, StorageEngine, WriteOperation};
 use prost::Message;
-use utils::config::engine_config::EngineConfig;
+use utils::config::engine::EngineConfig;
 
 use super::{StorageApi, StorageError};
 use crate::{

crates/curp/tests/it/common/curp_group.rs

@@ -39,10 +39,10 @@ use tracing::debug;
 use utils::{
     build_endpoint,
     config::{
-        client_config::ClientConfig,
-        curp_config::{CurpConfig, CurpConfigBuilder},
-        engine_config::EngineConfig,
-        storage_config::{default_quota, StorageConfig},
+        client::ClientConfig,
+        curp::{CurpConfig, CurpConfigBuilder},
+        engine::EngineConfig,
+        storage::{default_quota, StorageConfig},
     },
     task_manager::{tasks::TaskName, Listener, TaskManager},
 };

crates/curp/tests/it/server.rs

@@ -15,7 +15,7 @@ use curp_test_utils::{
 use madsim::rand::{thread_rng, Rng};
 use test_macros::abort_on_panic;
 use tokio::net::TcpListener;
-use utils::{config::client_config::ClientConfig, timestamp};
+use utils::{config::client::ClientConfig, timestamp};
 
 use crate::common::curp_group::{
     commandpb::ProposeId, CurpGroup, FetchClusterRequest, ProposeRequest, ProposeResponse,

crates/simulation/src/curp_group.rs

@@ -29,7 +29,7 @@ use parking_lot::Mutex;
 use tokio::sync::mpsc;
 use tracing::debug;
 use utils::{
-    config::{ClientConfig, CurpConfigBuilder, EngineConfig},
+    config::{client::ClientConfig, curp::CurpConfigBuilder, engine::EngineConfig},
     task_manager::TaskManager,
 };
 

crates/simulation/src/xline_group.rs

@@ -5,8 +5,8 @@ use madsim::runtime::NodeHandle;
 use tonic::transport::Channel;
 use tracing::debug;
 use utils::config::{
-    AuthConfig, ClientConfig, ClusterConfig, CompactConfig, CurpConfig, InitialClusterState,
-    ServerTimeout, StorageConfig, TlsConfig,
+    auth::AuthConfig, client::ClientConfig, compact::CompactConfig, curp::CurpConfig, cluster::{InitialClusterState, ClusterConfig},
+    server::ServerTimeout, storage::StorageConfig, tls::TlsConfig,
 };
 use xline::server::XlineServer;
 use xline_client::{

crates/utils/src/config/auth_config.rs → crates/utils/src/config/auth.rs

@@ -5,6 +5,7 @@ use serde::Deserialize;
 
 /// Xline auth configuration object
 #[allow(clippy::module_name_repetitions)]
+#[non_exhaustive]
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Getters, Default)]
 pub struct AuthConfig {
     /// The public key file

crates/utils/src/config/cluster_config.rs → crates/utils/src/config/cluster.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use getset::Getters;
 use serde::Deserialize;
 
-use super::{client_config::ClientConfig, curp_config::CurpConfig, server_config::ServerTimeout};
+use super::{client::ClientConfig, curp::CurpConfig, server::ServerTimeout};
 
 /// Cluster configuration object, including cluster relevant configuration fields
 #[allow(clippy::module_name_repetitions)]
@@ -105,6 +105,7 @@ impl ClusterConfig {
 }
 
 /// Cluster Range type alias
+#[allow(clippy::module_name_repetitions)]
 pub type ClusterRange = std::ops::Range<u64>;
 
 /// Initial cluster state of xline server

crates/utils/src/config/compact_config.rs → crates/utils/src/config/compact.rs

@@ -6,6 +6,7 @@ use serde::Deserialize;
 /// Compaction configuration
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Getters)]
 #[allow(clippy::module_name_repetitions)]
+#[non_exhaustive]
 pub struct CompactConfig {
     /// The max number of historical versions processed in a single compact operation
     #[getset(get = "pub")]

crates/utils/src/config/curp_config.rs → crates/utils/src/config/curp.rs

@@ -4,7 +4,7 @@ use derive_builder::Builder;
 use getset::Getters;
 use serde::Deserialize;
 
-use super::engine_config::EngineConfig;
+use super::engine::EngineConfig;
 
 /// Curp server timeout settings
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Getters, Builder)]

crates/utils/src/config/metrics_config.rs → crates/utils/src/config/metrics.rs

@@ -4,6 +4,7 @@ use serde::Deserialize;
 /// Xline metrics configuration object
 #[allow(clippy::module_name_repetitions)]
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Getters)]
+#[non_exhaustive]
 pub struct MetricsConfig {
     /// Enable or not
     #[getset(get = "pub")]
@@ -114,6 +115,7 @@ pub fn default_metrics_push_endpoint() -> String {
 #[non_exhaustive]
 #[derive(Copy, Clone, Debug, Deserialize, PartialEq, Eq, Default)]
 #[serde(rename_all(deserialize = "lowercase"))]
+#[allow(clippy::module_name_repetitions)]
 pub enum MetricsPushProtocol {
     /// HTTP protocol
     HTTP,

crates/utils/src/config/mod.rs

@@ -1,35 +1,34 @@
 /// Xline auth configuration module
-pub mod auth_config;
+pub mod auth;
 /// Curp client module
-pub mod client_config;
+pub mod client;
 /// Cluster configuration module
-pub mod cluster_config;
+pub mod cluster;
 /// Compaction configuration module
-pub mod compact_config;
+pub mod compact;
 /// Curp server module
-pub mod curp_config;
+pub mod curp;
 /// Engine Configuration module
-pub mod engine_config;
+pub mod engine;
 /// Log configuration module
-pub mod log_config;
+pub mod log;
 /// Xline metrics configuration module
-pub mod metrics_config;
+pub mod metrics;
 /// Xline server module
-pub mod server_config;
+pub mod server;
 /// Storage Configuration module
-pub mod storage_config;
+pub mod storage;
 /// Xline tls configuration module
-pub mod tls_config;
+pub mod tls;
 /// Xline tracing configuration module
-pub mod trace_config;
+pub mod trace;
 
 use getset::Getters;
 use serde::Deserialize;
 
 use crate::config::{
-    auth_config::AuthConfig, cluster_config::ClusterConfig, compact_config::CompactConfig,
-    log_config::LogConfig, metrics_config::MetricsConfig, storage_config::StorageConfig,
-    tls_config::TlsConfig, trace_config::TraceConfig,
+    auth::AuthConfig, cluster::ClusterConfig, compact::CompactConfig, log::LogConfig,
+    metrics::MetricsConfig, storage::StorageConfig, tls::TlsConfig, trace::TraceConfig,
 };
 
 /// Xline server configuration object
@@ -98,15 +97,15 @@ mod tests {
     use super::*;
     use crate::{
         config::{
-            client_config::{
+            client::{
                 default_client_id_keep_alive_interval, default_client_wait_synced_timeout,
                 default_fixed_backoff, default_propose_timeout, default_retry_count, ClientConfig,
             },
-            compact_config::AutoCompactConfig,
-            curp_config::CurpConfigBuilder,
-            engine_config::EngineConfig,
-            server_config::ServerTimeout,
-            storage_config::default_quota,
+            compact::AutoCompactConfig,
+            curp::CurpConfigBuilder,
+            engine::EngineConfig,
+            server::ServerTimeout,
+            storage::default_quota,
         },
         InitialClusterState, LevelConfig, MetricsPushProtocol, RotationConfig,
     };
@@ -301,7 +300,7 @@ mod tests {
     }
 
     #[test]
-    fn test_xline_server_default_config_should_be_loaded() {
+    fn test_xline_server_default_should_be_loaded() {
         let config: XlineServerConfig = toml::from_str(
             "[cluster]
                 name = 'node1'
@@ -390,7 +389,7 @@ mod tests {
     }
 
     #[test]
-    fn test_auto_revision_compactor_config_should_be_loaded() {
+    fn test_auto_revision_compactor_should_be_loaded() {
         let config: XlineServerConfig = toml::from_str(
             "[cluster]
                 name = 'node1'

crates/utils/src/config/server_config.rs → crates/utils/src/config/server.rs

@@ -5,6 +5,7 @@ use serde::Deserialize;
 
 /// Xline server settings
 #[derive(Copy, Clone, Debug, Deserialize, PartialEq, Eq, Getters)]
+#[allow(clippy::module_name_repetitions)]
 pub struct ServerTimeout {
     /// Range request retry timeout settings
     #[getset(get = "pub")]

crates/utils/src/config/storage_config.rs → crates/utils/src/config/storage.rs

@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-use crate::config::engine_config::EngineConfig;
+use crate::config::engine::EngineConfig;
 
 /// Storage Configuration
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq)]

crates/utils/src/config/trace_config.rs → crates/utils/src/config/trace.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use getset::Getters;
 use serde::Deserialize;
 
-use super::log_config::{default_log_level, level_format, LevelConfig};
+use super::log::{default_log_level, level_format, LevelConfig};
 
 /// Xline tracing configuration object
 #[allow(clippy::module_name_repetitions)]

crates/utils/src/parser.rs

@@ -4,9 +4,9 @@ use clippy_utilities::OverflowArithmetic;
 use thiserror::Error;
 
 pub use crate::config::{
-    cluster_config::{ClusterRange, InitialClusterState},
-    log_config::{LevelConfig, RotationConfig},
-    metrics_config::MetricsPushProtocol,
+    cluster::{ClusterRange, InitialClusterState},
+    log::{LevelConfig, RotationConfig},
+    metrics::MetricsPushProtocol,
 };
 
 /// seconds per minute

crates/xline-client/src/lib.rs

@@ -174,7 +174,7 @@ use tonic::transport::ClientTlsConfig;
 use tower::Service;
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
-use utils::{build_endpoint, config::client_config::ClientConfig};
+use utils::{build_endpoint, config::client::ClientConfig};
 use xlineapi::command::{Command, CurpClient};
 
 use crate::{

crates/xline-test-utils/src/lib.rs

@@ -10,15 +10,15 @@ use tokio::{
 };
 use tonic::transport::ClientTlsConfig;
 use utils::config::{
-    auth_config::AuthConfig,
-    cluster_config::{ClusterConfig, InitialClusterState},
-    compact_config::CompactConfig,
-    engine_config::EngineConfig,
-    log_config::LogConfig,
-    metrics_config::MetricsConfig,
-    storage_config::{default_quota, StorageConfig},
-    tls_config::TlsConfig,
-    trace_config::TraceConfig,
+    auth::AuthConfig,
+    cluster::{ClusterConfig, InitialClusterState},
+    compact::CompactConfig,
+    engine::EngineConfig,
+    log::LogConfig,
+    metrics::MetricsConfig,
+    storage::{default_quota, StorageConfig},
+    tls::TlsConfig,
+    trace::TraceConfig,
     XlineServerConfig,
 };
 use xline::server::XlineServer;

crates/xline/src/server/maintenance.rs

@@ -288,7 +288,7 @@ mod test {
 
     use test_macros::abort_on_panic;
     use tokio_stream::StreamExt;
-    use utils::config::engine_config::EngineConfig;
+    use utils::config::engine::EngineConfig;
 
     use super::*;
     use crate::storage::db::DB;

crates/xline/src/server/watch_server.rs

@@ -435,9 +435,7 @@ mod test {
         sync::mpsc,
         time::{sleep, timeout},
     };
-    use utils::config::{
-        engine_config::EngineConfig, server_config::default_watch_progress_notify_interval,
-    };
+    use utils::config::{engine::EngineConfig, server::default_watch_progress_notify_interval};
     use xlineapi::RequestWrapper;
 
     use super::*;

crates/xline/src/server/xline_server.rs

@@ -24,12 +24,12 @@ use tonic::transport::{server::Router, Server};
 use tracing::{info, warn};
 use utils::{
     config::{
-        auth_config::AuthConfig,
-        cluster_config::{ClusterConfig, InitialClusterState},
-        compact_config::CompactConfig,
-        engine_config::EngineConfig,
-        storage_config::StorageConfig,
-        tls_config::TlsConfig,
+        auth::AuthConfig,
+        cluster::{ClusterConfig, InitialClusterState},
+        compact::CompactConfig,
+        engine::EngineConfig,
+        storage::StorageConfig,
+        tls::TlsConfig,
     },
     task_manager::{tasks::TaskName, TaskManager},
 };