Locator fix master (#381)

* fix chain_header_by_height error * cherry-pick and clean up
2017-11-23 11:11:35 +00:00
parent 25969424ff
commit 77eac16702
1 changed files with 3 additions and 6 deletions
@@ -283,14 +283,11 @@ impl Syncer {

 		let locator = heights
 			.into_iter()
-			.map(|h| {
-				let header = self.chain.get_header_by_height(h).unwrap();
-				header.hash()
-			})
+			.map(|h| self.chain.get_header_by_height(h))
+			.filter(|h| h.is_ok())
+			.map(|h| h.unwrap().hash())
 			.collect();
-
 		debug!(LOGGER, "Sync: locator: {:?}", locator);
-
 		Ok(locator)
 	}