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

TestNet flushing and cleanup

Browse Source
This commit is contained in:
keorn
2016-12-12 19:44:24 +01:00
parent 722cd4d086
commit 19adb84527
4 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sync/src/tests/consensus.rs
View File

@@ -115,8 +115,6 @@ fn authority_round() {
#[test]
fn tendermint() {
::env_logger::init().ok();
let s0 = KeyPair::from_secret("1".sha3()).unwrap();
let s1 = KeyPair::from_secret("0".sha3()).unwrap();
let spec_factory = || {
@@ -167,7 +165,6 @@ fn tendermint() {
net.sync();
assert_eq!(net.peer(0).chain.chain_info().best_block_number, 2);
assert_eq!(net.peer(1).chain.chain_info().best_block_number, 2);
println!("HEIGHT 2");
net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 1.into())).unwrap();
net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 1.into())).unwrap();
@@ -175,29 +172,21 @@ fn tendermint() {
// Commit
net.peer(0).chain.engine().step();
net.peer(1).chain.engine().step();
// Propose and Prevote
// Propose
net.peer(0).chain.engine().step();
net.peer(1).chain.engine().step();
// Negotiate through a None round.
println!("RECONNECT");
net.peer(0).chain.miner().import_own_transaction(&*net.peer(0).chain, new_tx(s0.secret(), 2.into())).unwrap();
net.peer(1).chain.miner().import_own_transaction(&*net.peer(1).chain, new_tx(s1.secret(), 2.into())).unwrap();
// Send different prevotes
net.sync();
// Prevote timeout
net.peer(0).chain.engine().step();
net.peer(1).chain.engine().step();
// Precommit and commit
net.sync();
net.sync();
// Propose timeout.
println!("PROPOSE");
// Propose timeout
net.peer(0).chain.engine().step();
net.peer(1).chain.engine().step();
// Prevote, precommit and commit
net.sync();
net.peer(0).chain.engine().step();
net.peer(1).chain.engine().step();
::std::thread::sleep(::std::time::Duration::from_millis(1000));
net.sync();
let ci0 = net.peer(0).chain.chain_info();
let ci1 = net.peer(1).chain.chain_info();

2
sync/src/tests/helpers.rs
View File

@@ -250,6 +250,7 @@ impl<C> TestNet<C> where C: FlushingBlockChainClient {
pub fn sync_step(&mut self) {
for peer in 0..self.peers.len() {
self.peers[peer].chain.flush();
let packet = self.peers[peer].queue.write().pop_front();
if let Some(packet) = packet {
let disconnecting = {
@@ -258,6 +259,7 @@ impl<C> TestNet<C> where C: FlushingBlockChainClient {
let to_disconnect = {
let mut io = TestIo::new(&*p.chain, &p.snapshot_service, &p.queue, Some(peer as PeerId));
ChainSync::dispatch_packet(&p.sync, &mut io, peer as PeerId, packet.packet_id, &packet.data);
p.chain.flush();
io.to_disconnect.clone()
};
for d in &to_disconnect {