Use re-exported Chitchat symbols

quickwit-oss · Dec 6, 2023 · 012ff87 · 012ff87
1 parent 3242dde
commit 012ff87
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 20 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml
@@ -21,9 +21,8 @@ path = "src/generate_markdown.rs"
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bytesize = { workspace = true }
 bytes = { workspace = true }
-chitchat = { workspace = true }
+bytesize = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
 colored = { workspace = true }

diff --git a/quickwit/quickwit-cli/src/tool.rs b/quickwit/quickwit-cli/src/tool.rs
@@ -26,13 +26,11 @@ use std::time::{Duration, Instant};
 use std::{env, fmt, io};
 
 use anyhow::{bail, Context};
-use chitchat::transport::ChannelTransport;
-use chitchat::FailureDetectorConfig;
 use clap::{arg, ArgMatches, Command};
 use colored::{ColoredString, Colorize};
 use humantime::format_duration;
 use quickwit_actors::{ActorExitStatus, ActorHandle, Universe};
-use quickwit_cluster::{Cluster, ClusterMember};
+use quickwit_cluster::{ChannelTransport, Cluster, ClusterMember, FailureDetectorConfig};
 use quickwit_common::pubsub::EventBroker;
 use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::Uri;

diff --git a/quickwit/quickwit-cluster/src/lib.rs b/quickwit/quickwit-cluster/src/lib.rs
@@ -24,11 +24,9 @@ mod cluster;
 mod member;
 mod node;
 
-#[cfg(any(test, feature = "testsuite"))]
 pub use chitchat::transport::ChannelTransport;
 use chitchat::transport::UdpTransport;
-use chitchat::FailureDetectorConfig;
-pub use chitchat::{KeyChangeEvent, ListenerHandle};
+pub use chitchat::{FailureDetectorConfig, KeyChangeEvent, ListenerHandle};
 use quickwit_config::service::QuickwitService;
 use quickwit_config::NodeConfig;
 use quickwit_proto::indexing::CpuCapacity;

diff --git a/quickwit/quickwit-control-plane/Cargo.toml b/quickwit/quickwit-control-plane/Cargo.toml
@@ -45,7 +45,6 @@ mockall = { workspace = true }
 proptest = { workspace = true }
 rand = { workspace = true }
 
-chitchat = { workspace = true }
 quickwit-actors = { workspace = true, features = ["testsuite"] }
 quickwit-cluster = { workspace = true, features = ["testsuite"] }
 quickwit-common = { workspace = true, features = ["testsuite"] }

diff --git a/quickwit/quickwit-control-plane/src/tests.rs b/quickwit/quickwit-control-plane/src/tests.rs
@@ -20,11 +20,10 @@
 use std::num::NonZeroUsize;
 use std::time::Duration;
 
-use chitchat::transport::ChannelTransport;
 use fnv::FnvHashMap;
 use futures::{Stream, StreamExt};
 use quickwit_actors::{Inbox, Mailbox, Observe, Universe};
-use quickwit_cluster::{create_cluster_for_test, Cluster, ClusterChange};
+use quickwit_cluster::{create_cluster_for_test, ChannelTransport, Cluster, ClusterChange};
 use quickwit_common::test_utils::wait_until_predicate;
 use quickwit_common::tower::{Change, Pool};
 use quickwit_config::service::QuickwitService;

diff --git a/quickwit/quickwit-serve/Cargo.toml b/quickwit/quickwit-serve/Cargo.toml
@@ -67,12 +67,11 @@ time = { workspace = true }
 
 [dev-dependencies]
 assert-json-diff = { workspace = true }
-chitchat = { workspace = true }
 itertools = { workspace = true }
 mockall = { workspace = true }
 rand = { workspace = true }
-tokio = { workspace = true }
 tempfile = { workspace = true }
+tokio = { workspace = true }
 
 quickwit-actors = { workspace = true, features = ["testsuite"] }
 quickwit-cluster = { workspace = true, features = ["testsuite"] }

diff --git a/quickwit/quickwit-serve/src/health_check_api/handler.rs b/quickwit/quickwit-serve/src/health_check_api/handler.rs
@@ -120,8 +120,7 @@ async fn get_readiness(cluster: Cluster) -> impl warp::Reply {
 #[cfg(test)]
 mod tests {
 
-    use chitchat::transport::ChannelTransport;
-    use quickwit_cluster::create_cluster_for_test;
+    use quickwit_cluster::{create_cluster_for_test, ChannelTransport};
 
     #[tokio::test]
     async fn test_rest_search_api_health_checks() {

diff --git a/quickwit/quickwit-serve/src/lib.rs b/quickwit/quickwit-serve/src/lib.rs
@@ -901,8 +901,7 @@ async fn check_cluster_configuration(
 
 #[cfg(test)]
 mod tests {
-    use chitchat::transport::ChannelTransport;
-    use quickwit_cluster::{create_cluster_for_test, ClusterNode};
+    use quickwit_cluster::{create_cluster_for_test, ChannelTransport, ClusterNode};
     use quickwit_common::uri::Uri;
     use quickwit_config::SearcherConfig;
     use quickwit_metastore::{metastore_for_test, IndexMetadata};