diff --git a/Cargo.lock b/Cargo.lock index 39b53598598101cd2d29ca72b32aac96821740da..ebe7d21467a906dc6de8cd05c3c300331e7c9f93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -808,7 +808,6 @@ dependencies = [ "futures", "indoc", "inventory", - "itertools", "lazy_static", "libc", "linkme", diff --git a/Cargo.toml b/Cargo.toml index 1a0ade1db862e40c6d0af07eea3e50954a7d21c4..df17a407a074701f065a54efc298443372a664d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ tempfile = "3" thiserror = "1.0" indoc = "1.0" nix = "0.23.1" -itertools = "0.10.3" base64 = "0.13" lazy_static = "1.4" uuid = {version = "1.0", features = ["v3"]} diff --git a/src/discovery.rs b/src/discovery.rs index 86c32391e893bd4f45e658bd1f4eadee3b292c99..d187af67a02e3ef7488c218a30b6a07c0ba5ecde 100644 --- a/src/discovery.rs +++ b/src/discovery.rs @@ -215,7 +215,6 @@ fn proc_discover<'a>(request: Request, request_to: Address) -> Result<Response, #[cfg(test)] mod tests { - use itertools::Itertools; use std::collections::{BTreeMap, HashMap, HashSet}; use super::*; @@ -228,7 +227,7 @@ mod tests { instances.into_iter().map(|(k, v)| (k.into(), v)).collect(); let mut done = HashMap::<Address, Role>::new(); let len = instances.len(); - let addrs = instances.keys().cloned().collect_vec(); + let addrs = instances.keys().cloned().collect::<Vec<_>>(); let mut pending_requests: HashMap<_, _> = addrs .iter() .cloned() @@ -290,8 +289,9 @@ mod tests { ("host3:3", Discovery::new("3", ["host1:1"])), ]; let res = run(instances); + let first = res.values().next().unwrap().leader_address(); assert!( - res.values().map(Role::leader_address).all_equal(), + res.values().map(Role::leader_address).all(|la| la == first), "multiple leaders: {:#?}", res ); @@ -307,8 +307,9 @@ mod tests { ("host3:3", Discovery::new("3", ["host2:2"])), ]; let res = run(instances); + let first = res.values().next().unwrap().leader_address(); assert!( - res.values().map(Role::leader_address).all_equal(), + res.values().map(Role::leader_address).all(|la| la == first), "multiple leaders: {:#?}", res ); @@ -327,8 +328,9 @@ mod tests { ("host3:3", Discovery::new("3", ["host3:3"])), ]; let res = run(instances); + let first = res.values().next().unwrap().leader_address(); assert!( - res.values().map(Role::leader_address).all_equal(), + res.values().map(Role::leader_address).all(|la| la == first), "multiple leaders: {:#?}", res );