New sync algorithm

sync/src/tests/chain.rs

@@ -30,6 +30,16 @@ fn two_peers() {
 	assert_eq!(net.peer(0).chain.blocks.read().unwrap().deref(), net.peer(1).chain.blocks.read().unwrap().deref());
 }
 
+#[test]
+fn long_chain() {
+	::env_logger::init().ok();
+	let mut net = TestNet::new(2);
+	net.peer_mut(1).chain.add_blocks(50000, EachBlockWith::Nothing);
+	net.sync();
+	assert!(net.peer(0).chain.block(BlockID::Number(50000)).is_some());
+	assert_eq!(net.peer(0).chain.blocks.read().unwrap().deref(), net.peer(1).chain.blocks.read().unwrap().deref());
+}
+
 #[test]
 fn status_after_sync() {
 	::env_logger::init().ok();
@@ -47,7 +57,7 @@ fn takes_few_steps() {
 	net.peer_mut(1).chain.add_blocks(100, EachBlockWith::Uncle);
 	net.peer_mut(2).chain.add_blocks(100, EachBlockWith::Uncle);
 	let total_steps = net.sync();
-	assert!(total_steps < 7);
+	assert!(total_steps < 20);
 }
 
 #[test]
@@ -79,6 +89,7 @@ fn forked() {
 	// peer 1 has the best chain of 601 blocks
 	let peer1_chain = net.peer(1).chain.numbers.read().unwrap().clone();
 	net.sync();
+	assert_eq!(net.peer(0).chain.difficulty.read().unwrap().deref(), net.peer(1).chain.difficulty.read().unwrap().deref());
 	assert_eq!(net.peer(0).chain.numbers.read().unwrap().deref(), &peer1_chain);
 	assert_eq!(net.peer(1).chain.numbers.read().unwrap().deref(), &peer1_chain);
 	assert_eq!(net.peer(2).chain.numbers.read().unwrap().deref(), &peer1_chain);
@@ -97,13 +108,13 @@ fn restart() {
 	net.restart_peer(0);
 
 	let status = net.peer(0).sync.status();
-	assert_eq!(status.state, SyncState::NotSynced);
+	assert_eq!(status.state, SyncState::ChainHead);
 }
 
 #[test]
 fn status_empty() {
 	let net = TestNet::new(2);
-	assert_eq!(net.peer(0).sync.status().state, SyncState::NotSynced);
+	assert_eq!(net.peer(0).sync.status().state, SyncState::Idle);
 }
 
 #[test]
@@ -166,8 +177,17 @@ fn restart_on_malformed_block() {
 	let mut net = TestNet::new(2);
 	net.peer_mut(1).chain.add_blocks(10, EachBlockWith::Uncle);
 	net.peer_mut(1).chain.corrupt_block(6);
-	net.sync_steps(10);
+	net.sync_steps(20);
 
-	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 4);
+	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 5);
 }
 
+#[test]
+fn restart_on_broken_chain() {
+	let mut net = TestNet::new(2);
+	net.peer_mut(1).chain.add_blocks(10, EachBlockWith::Uncle);
+	net.peer_mut(1).chain.corrupt_block_parent(6);
+	net.sync_steps(20);
+
+	assert_eq!(net.peer(0).chain.chain_info().best_block_number, 5);
+}

sync/src/tests/helpers.rs

@@ -92,9 +92,11 @@ impl TestNet {
 			started: false,
 		};
 		for _ in 0..n {
+			let chain = TestBlockChainClient::new();
+			let sync = ChainSync::new(SyncConfig::default(), Miner::new(false, Spec::new_test()), &chain);
 			net.peers.push(TestPeer {
-				chain: TestBlockChainClient::new(),
-				sync: ChainSync::new(SyncConfig::default(), Miner::new(false, Spec::new_test())),
+				sync: sync,
+				chain: chain,
 				queue: VecDeque::new(),
 			});
 		}