grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rebroadcast panic beta (#4085)

Browse Source 
* fix

* fix compile

* fix backport

* clean up old method

* remove unnecessary reference

* simplify

* Fixing 'simplify'


Former-commit-id: c0fcfaad4a966fe7bd646007ab6ea9742df4a86a
This commit is contained in:
keorn 2017-01-09 12:52:40 +01:00 committed by Arkadiy Paronyan
parent e50874daa1
commit e152d012b4
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sync/src/chain.rs
View File

@ -1854,11 +1854,10 @@ impl ChainSync {
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
fn select_random_lagging_peers(&mut self, peers: &[PeerId]) -> Vec<PeerId> { fn select_random_peers(peers: &[PeerId]) -> Vec<PeerId> {
use rand::Rng;
// take sqrt(x) peers // take sqrt(x) peers
let mut peers = peers.to_vec(); let mut peers = peers.to_vec();
let mut count = (self.peers.len() as f64).powf(0.5).round() as usize; let mut count = (peers.len() as f64).powf(0.5).round() as usize;
count = min(count, MAX_PEERS_PROPAGATION); count = min(count, MAX_PEERS_PROPAGATION);
count = max(count, MIN_PEERS_PROPAGATION); count = max(count, MIN_PEERS_PROPAGATION);
random::new().shuffle(&mut peers); random::new().shuffle(&mut peers);
@ -1984,7 +1983,7 @@ impl ChainSync {
let mut peers = self.get_lagging_peers(&chain_info, io); let mut peers = self.get_lagging_peers(&chain_info, io);
if sealed.is_empty() { if sealed.is_empty() {
let hashes = self.propagate_new_hashes(&chain_info, io, &peers); let hashes = self.propagate_new_hashes(&chain_info, io, &peers);
peers = self.select_random_lagging_peers(&peers); peers = ChainSync::select_random_peers(&peers);
let blocks = self.propagate_blocks(&chain_info, io, sealed, &peers); let blocks = self.propagate_blocks(&chain_info, io, sealed, &peers);
if blocks != 0 || hashes != 0 { if blocks != 0 || hashes != 0 {
trace!(target: "sync", "Sent latest {} blocks and {} hashes to peers.", blocks, hashes); trace!(target: "sync", "Sent latest {} blocks and {} hashes to peers.", blocks, hashes);
@ -2018,19 +2017,13 @@ impl ChainSync {
self.restart(io); self.restart(io);
} }
if !is_syncing && !enacted.is_empty() { if !is_syncing && !enacted.is_empty() && !self.peers.is_empty() {
// Select random peers to re-broadcast transactions to. // Select random peer to re-broadcast transactions to.
let mut random = random::new(); let peer = random::new().gen_range(0, self.peers.len());
let len = self.peers.len(); trace!(target: "sync", "Re-broadcasting transactions to a random peer.");
let peers = random.gen_range(0, min(len, 3)); self.peers.values_mut().nth(peer).map(|mut peer_info|
trace!(target: "sync", "Re-broadcasting transactions to {} random peers.", peers); peer_info.last_sent_transactions.clear()
);
for _ in 0..peers {
let peer = random.gen_range(0, len);
self.peers.values_mut().nth(peer).map(|mut peer_info| {
peer_info.last_sent_transactions.clear()
});
}
} }
} }
} }
@ -2392,6 +2385,26 @@ mod tests {
assert_eq!(0x02, io.queue[0].packet_id); assert_eq!(0x02, io.queue[0].packet_id);
} }
#[test]
fn does_not_fail_for_no_peers() {
let mut client = TestBlockChainClient::new();
client.add_blocks(100, EachBlockWith::Uncle);
client.insert_transaction_to_queue();
// Sync with no peers
let mut sync = ChainSync::new(SyncConfig::default(), &client);
let mut queue = VecDeque::new();
let ss = TestSnapshotService::new();
let mut io = TestIo::new(&mut client, &ss, &mut queue, None);
let peer_count = sync.propagate_new_transactions(&mut io);
sync.chain_new_blocks(&mut io, &[], &[], &[], &[], &[]);
// Try to propagate same transactions for the second time
let peer_count2 = sync.propagate_new_transactions(&mut io);
assert_eq!(0, io.queue.len());
assert_eq!(0, peer_count);
assert_eq!(0, peer_count2);
}
#[test] #[test]
fn propagates_transactions_without_alternating() { fn propagates_transactions_without_alternating() {
let mut client = TestBlockChainClient::new(); let mut client = TestBlockChainClient::new();