Merge with master

sync/src/chain.rs

@@ -1314,7 +1314,7 @@ impl ChainSync {
 			return 0;
 		}
 
-		let mut transactions = io.chain().all_transactions();
+		let mut transactions = io.chain().pending_transactions();
 		if transactions.is_empty() {
 			return 0;
 		}

sync/src/lib.rs

@@ -44,8 +44,14 @@
 //! 	let mut service = NetworkService::new(NetworkConfiguration::new()).unwrap();
 //! 	service.start().unwrap();
 //! 	let dir = env::temp_dir();
-//! 	let client = Client::new(ClientConfig::default(), ethereum::new_frontier(true), &dir, Arc::new(Miner::default()), service.io().channel()).unwrap();
-//! 	let miner = Miner::new(false, ethereum::new_frontier(true));
+//! 	let miner = Miner::new(Default::default(), ethereum::new_frontier(true), None);
+//! 	let client = Client::new(
+//!			ClientConfig::default(),
+//!			ethereum::new_frontier(true),
+//!			&dir,
+//!			miner,
+//!			service.io().channel()
+//!		).unwrap();
 //! 	let sync = EthSync::new(SyncConfig::default(), client);
 //! 	EthSync::register(&mut service, sync);
 //! }