refactor: split config into multiple modules

Signed-off-by: Harsh1s <[email protected]>
xline-kv · Mar 6, 2024 · 398a86b · 398a86b
1 parent f12ba4c
commit 398a86b
Show file tree

Hide file tree

Showing 43 changed files with 1,739 additions and 1,549 deletions.
diff --git a/crates/benchmark/src/runner.rs b/crates/benchmark/src/runner.rs
@@ -19,7 +19,7 @@ use tokio::{
     time::{Duration, Instant},
 };
 use tracing::debug;
-use utils::config::ClientConfig;
+use utils::config::client_config::ClientConfig;
 use xline_client::{types::kv::PutRequest, ClientOptions};
 
 use crate::{args::Commands, bench_client::BenchClient, Benchmark};

diff --git a/crates/curp-test-utils/src/test_cmd.rs b/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::EngineConfig;
+use utils::config::engine_config::EngineConfig;
 
 use crate::{META_TABLE, REVISION_TABLE, TEST_TABLE};
 
@@ -411,7 +411,7 @@ impl TestCE {
         after_sync_sender: mpsc::UnboundedSender<(TestCommand, LogIndex)>,
         engine_cfg: EngineConfig,
     ) -> Self {
-        let engine_type = match engine_cfg {
+        let engine_type: EngineType = match engine_cfg {
             EngineConfig::Memory => EngineType::Memory,
             EngineConfig::RocksDB(path) => EngineType::Rocks(path),
             _ => unreachable!("Not supported storage type"),

diff --git a/crates/curp/src/client/mod.rs b/crates/curp/src/client/mod.rs
@@ -26,9 +26,9 @@ use futures::{stream::FuturesUnordered, StreamExt};
 #[cfg(not(madsim))]
 use tonic::transport::ClientTlsConfig;
 use tracing::debug;
+use utils::{build_endpoint, config::client_config::ClientConfig};
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
-use utils::{build_endpoint, config::ClientConfig};
 
 use self::{
     retry::{Retry, RetryConfig},

diff --git a/crates/curp/src/server/cmd_worker/mod.rs b/crates/curp/src/server/cmd_worker/mod.rs
@@ -415,7 +415,7 @@ mod tests {
     use test_macros::abort_on_panic;
     use tokio::{sync::mpsc, time::Instant};
     use tracing_test::traced_test;
-    use utils::config::EngineConfig;
+    use utils::config::engine_config::EngineConfig;
 
     use super::*;
     use crate::{log_entry::LogEntry, rpc::ProposeId};

diff --git a/crates/curp/src/server/curp_node.rs b/crates/curp/src/server/curp_node.rs
@@ -18,12 +18,9 @@ use tokio::{
 #[cfg(not(madsim))]
 use tonic::transport::ClientTlsConfig;
 use tracing::{debug, error, info, trace, warn};
+use utils::{config::curp_config::CurpConfig, task_manager::{tasks::TaskName, Listener, State, TaskManager}};
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
-use utils::{
-    config::CurpConfig,
-    task_manager::{tasks::TaskName, Listener, State, TaskManager},
-};
 
 use super::{
     cmd_board::{CmdBoardRef, CommandBoard},

diff --git a/crates/curp/src/server/mod.rs b/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::CurpConfig, task_manager::TaskManager, tracing::Extract};
+use utils::{config::curp_config::CurpConfig, task_manager::TaskManager, tracing::Extract};
 
 use self::curp_node::CurpNode;
 pub use self::raw_curp::RawCurp;

diff --git a/crates/curp/src/server/raw_curp/log.rs b/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::{default_batch_max_size, default_log_entries_cap};
+    use utils::config::curp_config::{default_batch_max_size, default_log_entries_cap};
 
     use super::*;
 

diff --git a/crates/curp/src/server/raw_curp/mod.rs b/crates/curp/src/server/raw_curp/mod.rs
@@ -38,7 +38,7 @@ use tracing::{
 #[cfg(madsim)]
 use utils::ClientTlsConfig;
 use utils::{
-    config::CurpConfig,
+    config::curp_config::CurpConfig,
     parking_lot_lock::{MutexMap, RwLockMap},
     task_manager::TaskManager,
 };

diff --git a/crates/curp/src/server/raw_curp/tests.rs b/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::{
+use utils::config::curp_config::{
     default_candidate_timeout_ticks, default_follower_timeout_ticks, default_heartbeat_interval,
     CurpConfigBuilder,
 };

diff --git a/crates/curp/src/server/storage/db.rs b/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::EngineConfig;
+use utils::config::engine_config::EngineConfig;
 
 use super::{StorageApi, StorageError};
 use crate::{

diff --git a/crates/curp/tests/it/common/curp_group.rs b/crates/curp/tests/it/common/curp_group.rs
@@ -36,7 +36,8 @@ use tracing::debug;
 use utils::{
     build_endpoint,
     config::{
-        default_quota, ClientConfig, CurpConfig, CurpConfigBuilder, EngineConfig, StorageConfig,
+        client_config::ClientConfig, curp_config::CurpConfig, curp_config::CurpConfigBuilder,
+        engine_config::EngineConfig, storage_config::default_quota, storage_config::StorageConfig,
     },
     task_manager::{tasks::TaskName, Listener, TaskManager},
 };

diff --git a/crates/curp/tests/it/server.rs b/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::ClientConfig, timestamp};
+use utils::{config::client_config::ClientConfig, timestamp};
 
 use crate::common::curp_group::{
     commandpb::ProposeId, CurpGroup, FetchClusterRequest, ProposeRequest, ProposeResponse,