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

[beta] Avoid re-broadcasting transactions on each block (#4047)

Browse Source 
* Avoid re-broadcasting transactions on each block

* Fixing test and nightly compilation

* Fixing comment [ci:skip]


Former-commit-id: a7ed6f65cf88d570e0fd5fc235af83b8a70fbc46
This commit is contained in:
Tomasz Drwięga 2017-01-06 10:38:31 +01:00 committed by Gav Wood
parent dee93c6ac2
commit f45fe8a1fd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sync/src/chain.rs
View File

@ -1995,9 +1995,6 @@ impl ChainSync {
trace!(target: "sync", "Bad blocks in the queue, restarting"); trace!(target: "sync", "Bad blocks in the queue, restarting");
self.restart(io); self.restart(io);
} }
for peer_info in self.peers.values_mut() {
peer_info.last_sent_transactions.clear();
}
} }
} }
@ -2334,7 +2331,7 @@ mod tests {
} }
#[test] #[test]
fn propagates_transactions_again_after_new_block() { fn should_not_propagate_transactions_again_after_new_block() {
let mut client = TestBlockChainClient::new(); let mut client = TestBlockChainClient::new();
client.add_blocks(100, EachBlockWith::Uncle); client.add_blocks(100, EachBlockWith::Uncle);
client.insert_transaction_to_queue(); client.insert_transaction_to_queue();
@ -2347,14 +2344,13 @@ mod tests {
// Try to propagate same transactions for the second time // Try to propagate same transactions for the second time
let peer_count2 = sync.propagate_new_transactions(&mut io); let peer_count2 = sync.propagate_new_transactions(&mut io);
// 2 message should be send // 1 message should be send
assert_eq!(2, io.queue.len()); assert_eq!(1, io.queue.len());
// 1 peer should be updated twice // 1 peer should be updated only for the first time
assert_eq!(1, peer_count); assert_eq!(1, peer_count);
assert_eq!(1, peer_count2); assert_eq!(0, peer_count2);
// TRANSACTIONS_PACKET // TRANSACTIONS_PACKET
assert_eq!(0x02, io.queue[0].packet_id); assert_eq!(0x02, io.queue[0].packet_id);
assert_eq!(0x02, io.queue[1].packet_id);
} }
#[test] #[test]