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

Add some randomness to most_work_peer (#364)

Browse source
This commit is contained in:
AntiochP 2017-11-22 16:07:21 -05:00 committed by Ignotus Peverell
parent 861c54c13b
commit 348038f0ed
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
p2p/src/server.rs
View file

@ -24,7 +24,7 @@ use std::time::Duration;
use futures; use futures;
use futures::{Future, Stream}; use futures::{Future, Stream};
use futures::future::{self, IntoFuture}; use futures::future::{self, IntoFuture};
use rand::{self, Rng}; use rand::{thread_rng, Rng};
use tokio_core::net::{TcpListener, TcpStream}; use tokio_core::net::{TcpListener, TcpStream};
use tokio_core::reactor; use tokio_core::reactor;
use tokio_timer::Timer; use tokio_timer::Timer;
@ -274,14 +274,15 @@ impl Server {
if peers.len() == 0 { if peers.len() == 0 {
return None; return None;
} }
// we want to randomize which "most_work_peer" we select
thread_rng().shuffle(&mut peers[..]);
peers.sort_by_key(|p| { peers.sort_by_key(|p| {
let p = p.read().unwrap(); let p = p.read().unwrap();
p.info.total_difficulty.clone() p.info.total_difficulty.clone()
}); });
// TODO we should shuffle here
// we want a random peer with highest total_difficulty
let peer = peers.last().unwrap(); let peer = peers.last().unwrap();
Some(peer.clone()) Some(peer.clone())
} }
@ -290,11 +291,9 @@ impl Server {
pub fn random_peer(&self) -> Option<Arc<RwLock<Peer>>> { pub fn random_peer(&self) -> Option<Arc<RwLock<Peer>>> {
let peers = self.all_peers(); let peers = self.all_peers();
if peers.len() == 0 { if peers.len() == 0 {
None return None;
} else {
let idx = rand::thread_rng().gen_range(0, peers.len());
Some(peers[idx].clone())
} }
Some(thread_rng().choose(&peers).unwrap().clone())
} }
/// Broadcasts the provided block to all our peers. A peer implementation /// Broadcasts the provided block to all our peers. A peer implementation