Update API

core/src/key_manager.rs

@@ -237,7 +237,7 @@ where
  ch: Receiver<NodeResponse<T::Id, <T::Resolver as AddressResolver>::ResolvedAddress>>,
  ) -> KeyResponse<T::Id> {
  let mut resp = KeyResponse {
- num_nodes: self.serf.get().unwrap().num_nodes().await,
+ num_nodes: self.serf.get().unwrap().num_members().await,
  messages: HashMap::new(),
  num_resp: 0,
  num_err: 0,

core/src/serf/api.rs

@@ -189,12 +189,13 @@ where
  /// Returns the number of nodes in the serf cluster, regardless of
  /// their health or status.
  #[inline]
- pub async fn num_nodes(&self) -> usize {
+ pub async fn num_members(&self) -> usize {
  self.inner.members.read().await.states.len()
  }
 
  /// Returns the key manager for the current serf instance
  #[cfg(feature = "encryption")]
+ #[cfg_attr(docsrs, doc(cfg(feature = "encryption")))]
  #[inline]
  pub fn key_manager(&self) -> &crate::key_manager::KeyManager<T, D> {
  &self.inner.key_manager
@@ -628,7 +629,6 @@ where
  }
 
  /// Returns the underlying [`Memberlist`] instance
- #[allow(private_interfaces)]
  #[inline]
  pub fn memberlist(&self) -> &Memberlist<T, SerfDelegate<T, D>> {
  &self.inner.memberlist

core/src/serf/base/tests.rs

@@ -50,7 +50,7 @@ where
  <T::Runtime as RuntimeLite>::sleep(Duration::from_millis(25)).await;
  let mut conds = Vec::with_capacity(serfs.len());
  for (idx, s) in serfs.iter().enumerate() {
- let n = s.num_nodes().await;
+ let n = s.num_members().await;
  if n == desired_nodes {
  conds.push(true);
  continue;

core/src/serf/base/tests/serf.rs

@@ -457,7 +457,7 @@ where
  .await
  .unwrap();
 
- assert_eq!(s1.num_nodes().await, 1);
+ assert_eq!(s1.num_members().await, 1);
 
  let serfs = [s1, s2];
  wait_until_num_nodes(1, &serfs).await;

core/src/serf/base/tests/serf/leave.rs

@@ -494,7 +494,7 @@ pub async fn serf_leave_snapshot_recovery<T, F>(
  let mut cond2 = false;
  loop {
  if !cond1 {
- let num = serfs[1].num_nodes().await;
+ let num = serfs[1].num_members().await;
  if num == 1 {
  cond1 = true;
  }

core/src/serf/base/tests/serf/reconnect.rs

@@ -202,15 +202,15 @@ pub async fn serf_per_node_reconnect_timeout<T>(
  let mut cond2 = false;
  loop {
  <T::Runtime as RuntimeLite>::sleep(Duration::from_millis(25)).await;
- let n = s1.num_nodes().await;
+ let n = s1.num_members().await;
  if n == 1 {
  cond1 = true;
  }
  if start.elapsed() > Duration::from_secs(7) {
  panic!("s1 got {} expected {}", n, 1);
  }
 
- let n = s2.num_nodes().await;
+ let n = s2.num_members().await;
  if n == 1 {
  cond2 = true;
  }
@@ -233,15 +233,15 @@ pub async fn serf_per_node_reconnect_timeout<T>(
  let mut cond2 = false;
  loop {
  <T::Runtime as RuntimeLite>::sleep(Duration::from_millis(25)).await;
- let n = s1.num_nodes().await;
+ let n = s1.num_members().await;
  if n == 2 {
  cond1 = true;
  }
  if start.elapsed() > Duration::from_secs(7) {
  panic!("s1 got {} expected {}", n, 2);
  }
 
- let n = s2.num_nodes().await;
+ let n = s2.num_members().await;
  if n == 2 {
  cond2 = true;
  }