Merge pull request #744 from ethcore/sync

Missing return for #737
openethereum · Mar 15, 2016 · 5a96f99 · 5a96f99
2 parents 77bdca5 + e538b41
commit 5a96f99
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
@@ -481,6 +481,7 @@ impl ChainSync {
 		trace!(target: "sync", "{} -> NewBlock ({})", peer_id, h);
 		if !self.have_common_block {
 			trace!(target: "sync", "NewBlock ignored while seeking");
+			return Ok(());
 		}
 		let header: BlockHeader = try!(header_rlp.as_val());
  		let mut unknown = false;
@@ -1497,6 +1498,7 @@ mod tests {
 
 		let mut queue = VecDeque::new();
 		let mut sync = dummy_sync_with_peer(client.block_hash_delta_minus(5));
+		sync.have_common_block = true;
 		let mut io = TestIo::new(&mut client, &mut queue, None);
 
 		let block = UntrustedRlp::new(&block_data);