Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused code from AddressBook #2359

Merged
merged 2 commits into from
Jun 21, 2021
Merged

Remove unused code from AddressBook #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4907401
Remove unused code
teor2345 Jun 15, 2021
55ef186
Fix a comment in add_initial_peers
teor2345 Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions zebra-network/src/address_book.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,18 +163,6 @@ impl AddressBook {
peers
}

/// Returns true if the address book has an entry for `addr`.
pub fn contains_addr(&self, addr: &SocketAddr) -> bool {
let _guard = self.span.enter();
self.by_addr.contains_key(addr)
}

/// Returns the entry corresponding to `addr`, or `None` if it does not exist.
pub fn get_by_addr(&self, addr: SocketAddr) -> Option<MetaAddr> {
let _guard = self.span.enter();
self.by_addr.get(&addr).cloned()
}

/// Apply `change` to the address book, returning the updated `MetaAddr`,
/// if the change was valid.
///
Expand Down Expand Up @@ -242,6 +230,7 @@ impl AddressBook {
///
/// All address removals should go through `take`, so that the address
/// book metrics are accurate.
#[allow(dead_code)]
fn take(&mut self, removed_addr: SocketAddr) -> Option<MetaAddr> {
let _guard = self.span.enter();
trace!(
Expand Down Expand Up @@ -338,14 +327,6 @@ impl AddressBook {
.cloned()
}

/// Returns an iterator that drains entries from the address book.
///
/// Removes entries in reconnection attempt then arbitrary order,
/// see [`peers`] for details.
pub fn drain(&'_ mut self) -> impl Iterator<Item = MetaAddr> + '_ {
Drain { book: self }
}

/// Returns the number of entries in this address book.
pub fn len(&self) -> usize {
self.by_addr.len()
Expand Down Expand Up @@ -466,16 +447,3 @@ impl Extend<MetaAddrChange> for AddressBook {
}
}
}

struct Drain<'a> {
book: &'a mut AddressBook,
}

impl<'a> Iterator for Drain<'a> {
type Item = MetaAddr;

fn next(&mut self) -> Option<Self::Item> {
let next_item_addr = self.book.peers().next()?.addr;
self.book.take(next_item_addr)
}
}
14 changes: 9 additions & 5 deletions zebra-network/src/peer_set/initialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,16 @@ where
S::Future: Send + 'static,
{
info!(?initial_peers, "connecting to initial peer set");
// ## Correctness:
// # Security
//
// Each `CallAll` can hold one `Buffer` or `Batch` reservation for
// an indefinite period. We can use `CallAllUnordered` without filling
// the underlying `Inbound` buffer, because we immediately drive this
// single `CallAll` to completion, and handshakes have a short timeout.
// TODO: rate-limit initial seed peer connections (#2326)
//
// # Correctness
//
// Each `FuturesUnordered` can hold one `Buffer` or `Batch` reservation for
// an indefinite period. We can use `FuturesUnordered` without filling
// the underlying network buffers, because we immediately drive this
// single `FuturesUnordered` to completion, and handshakes have a short timeout.
let mut handshakes: FuturesUnordered<_> = initial_peers
.into_iter()
.map(|addr| {
Expand Down