Make `State::dhb` public, make `Hydrabadger::peers` public.

This commit is contained in:
c0gent 2018-10-19 13:50:28 -07:00
parent d1f615bd90
commit 1898bea18c
No known key found for this signature in database
GPG Key ID: 9CC25E71A743E892
3 changed files with 7 additions and 7 deletions

View File

@ -208,7 +208,7 @@ impl<T: Contribution> Hydrabadger<T> {
}
/// Returns a reference to the peers list.
pub(crate) fn peers(&self) -> RwLockReadGuard<Peers<T>> {
pub fn peers(&self) -> RwLockReadGuard<Peers<T>> {
self.inner.peers.read()
}

View File

@ -445,7 +445,7 @@ impl<T: Contribution> State<T> {
}
/// Returns a reference to the internal HB instance.
pub(super) fn dhb(&self) -> Option<&DynamicHoneyBadger<T, Uid>> {
pub fn dhb(&self) -> Option<&DynamicHoneyBadger<T, Uid>> {
match self {
State::Observer { ref dhb, .. } => dhb.as_ref(),
State::Validator { ref dhb, .. } => dhb.as_ref(),

View File

@ -388,7 +388,7 @@ impl<T: Contribution> Peer<T> {
// TODO: Keep a separate `HashSet` of validator `OutAddrs` to avoid having to
// iterate through entire list.
#[derive(Debug)]
pub(crate) struct Peers<T: Contribution> {
pub struct Peers<T: Contribution> {
peers: HashMap<OutAddr, Peer<T>>,
out_addrs: HashMap<Uid, OutAddr>,
}
@ -532,24 +532,24 @@ impl<T: Contribution> Peers<T> {
}
/// Returns an Iterator over the list of peers.
pub(crate) fn peers(&self) -> HashMapValues<OutAddr, Peer<T>> {
pub fn peers(&self) -> HashMapValues<OutAddr, Peer<T>> {
self.peers.values()
}
/// Returns an iterator over the list of validators.
pub(crate) fn validators(&self) -> impl Iterator<Item = &Peer<T>> {
pub fn validators(&self) -> impl Iterator<Item = &Peer<T>> {
self.peers.values().filter(|p| p.is_validator())
}
/// Returns the current number of connected peers.
pub(crate) fn count_total(&self) -> usize {
pub fn count_total(&self) -> usize {
self.peers.len()
}
/// Returns the current number of connected and established validators.
///
/// This is semi-expensive (O(n)).
pub(crate) fn count_validators(&self) -> usize {
pub fn count_validators(&self) -> usize {
self.validators().count()
}