Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

broadcast to subset of peers (in case we are connected to more than preferred number of peers) (#488) (#489)

Browse source
This commit is contained in:
AntiochP 2017-12-14 15:33:22 -05:00 committed by GitHub
parent c59f3ddb7c
commit 9e94d3bd6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
p2p/src/peers.rs
View file

@ -73,8 +73,11 @@ impl Peers {
self.get_peer(addr).is_some() self.get_peer(addr).is_some()
} }
/// Get vec of peers we are currently connected to.
pub fn connected_peers(&self) -> Vec<Arc<RwLock<Peer>>> { pub fn connected_peers(&self) -> Vec<Arc<RwLock<Peer>>> {
self.peers.read().unwrap().values().map(|p| p.clone()).collect() let mut res = self.peers.read().unwrap().values().cloned().collect::<Vec<_>>();
thread_rng().shuffle(&mut res);
res
} }
/// Get a peer we're connected to by address. /// Get a peer we're connected to by address.
@ -133,10 +136,10 @@ impl Peers {
} }
/// Returns a random connected peer. /// Returns a random connected peer.
pub fn random_peer(&self) -> Option<Arc<RwLock<Peer>>> { // pub fn random_peer(&self) -> Option<Arc<RwLock<Peer>>> {
let peers = self.connected_peers(); // let peers = self.connected_peers();
Some(thread_rng().choose(&peers).unwrap().clone()) // Some(thread_rng().choose(&peers).unwrap().clone())
} // }
pub fn is_banned(&self, peer_addr: SocketAddr) -> bool { pub fn is_banned(&self, peer_addr: SocketAddr) -> bool {
if let Ok(peer_data) = self.store.get_peer(peer_addr) { if let Ok(peer_data) = self.store.get_peer(peer_addr) {
@ -162,13 +165,15 @@ impl Peers {
} }
} }
/// Broadcasts the provided block to all our peers. A peer implementation /// Broadcasts the provided block to PEER_PREFERRED_COUNT of our peers.
/// may drop the broadcast request if it knows the remote peer already has /// We may be connected to PEER_MAX_COUNT peers so we only
/// the block. /// want to broadcast to a random subset of peers.
/// A peer implementation may drop the broadcast request
/// if it knows the remote peer already has the block.
pub fn broadcast_block(&self, b: &core::Block) { pub fn broadcast_block(&self, b: &core::Block) {
let peers = self.connected_peers(); let peers = self.connected_peers();
let mut count = 0; let mut count = 0;
for p in peers { for p in peers.iter().take(8) {
let p = p.read().unwrap(); let p = p.read().unwrap();
if p.is_connected() { if p.is_connected() {
if let Err(e) = p.send_block(b) { if let Err(e) = p.send_block(b) {
@ -181,12 +186,14 @@ impl Peers {
debug!(LOGGER, "Broadcasted block {} to {} peers.", b.header.height, count); debug!(LOGGER, "Broadcasted block {} to {} peers.", b.header.height, count);
} }
/// Broadcasts the provided transaction to all our peers. A peer /// Broadcasts the provided transaction to PEER_PREFERRED_COUNT of our peers.
/// implementation may drop the broadcast request if it knows the /// We may be connected to PEER_MAX_COUNT peers so we only
/// remote peer already has the transaction. /// want to broadcast to a random subset of peers.
/// A peer implementation may drop the broadcast request
/// if it knows the remote peer already has the transaction.
pub fn broadcast_transaction(&self, tx: &core::Transaction) { pub fn broadcast_transaction(&self, tx: &core::Transaction) {
let peers = self.connected_peers(); let peers = self.connected_peers();
for p in peers { for p in peers.iter().take(8) {
let p = p.read().unwrap(); let p = p.read().unwrap();
if p.is_connected() { if p.is_connected() {
if let Err(e) = p.send_transaction(tx) { if let Err(e) = p.send_transaction(tx) {