Merge branch 'net' into discovery

sync/src/chain.rs

@@ -466,6 +466,7 @@ impl ChainSync {
 					trace!(target: "sync", "New block already queued {:?}", h);
 				},
 				Ok(_) => {
+					self.last_imported_block = Some(header.number);
 					trace!(target: "sync", "New block queued {:?}", h);
 				},
 				Err(ImportError::UnknownParent) => {

sync/src/range_collection.rs

@@ -40,7 +40,7 @@ pub trait RangeCollection<K, V> {
 	fn get_tail(&mut self, key: &K) -> Range<K>;
 	/// Remove all elements < `start` in the range that contains `start` - 1
 	fn remove_head(&mut self, start: &K);
-	/// Remove all elements >= `start` in the range that contains `start` 
+	/// Remove all elements >= `start` in the range that contains `start`
 	fn remove_tail(&mut self, start: &K);
 	/// Remove all elements >= `tail`
 	fn insert_item(&mut self, key: K, value: V);
@@ -168,6 +168,7 @@ impl<K, V> RangeCollection<K, V> for Vec<(K, Vec<V>)> where K: Ord + PartialEq +
 	fn insert_item(&mut self, key: K, value: V) {
 		assert!(!self.have_item(&key));
 
+		// todo: fix warning
 		let lower = match self.binary_search_by(|&(k, _)| k.cmp(&key).reverse()) {
 			Ok(index) => index,
 			Err(index) => index,