Backports to beta (#1919)

* RPC errors & logs (#1845)

* Refactoring errors in RPC

* Updating jsonrpc-core

* Fixing code_at

* Avoid mentioning obvious segments in proof

[ci:skip]

* fixed cache_manager lock order

* Purging .derefs, fixing clippy warnings. (#1890)

* Fixing clippy warnings

* Purging derefs

* Simplifying engine derefs

* Simplifying more engine derefs

* Adding more details to miner log

* fixed #1889, .DS_Store is no longer treated as key file (#1892)

* fixed #1889, .DS_Store is no longer treated as key file

* ethstore filters directories, hidden files and common system files

* fixed compiling

* fix regression with geth dir

* fix regression with geth dir

* Fix ipc compilation and add ipc feature to test targets (#1902)

* fix compilation and add it to the ci run

* no separator?

* use quotes and spaces

* RocksDB version bump

* Don't return deleted nodes that are not yet flushed (#1908)

* polling & connection timeouts (#1910)

* Peers RPC + UI displaying active/connected/max peers (#1915)

* Peers API

* Bumping Parity-UI

* Fixing tests

* Save nodes removed from backing_overlay until commit (#1917)

parity/configuration.rs

@@ -501,8 +501,6 @@ impl Configuration {
 		NetworkSettings {
 			name: self.args.flag_identity.clone(),
 			chain: self.chain(),
-			max_peers: self.max_peers(),
-			min_peers: self.min_peers(),
 			network_port: self.args.flag_port,
 			rpc_enabled: !self.args.flag_jsonrpc_off && !self.args.flag_no_jsonrpc,
 			rpc_interface: self.args.flag_rpcaddr.clone().unwrap_or(self.args.flag_jsonrpc_interface.clone()),
@@ -511,6 +509,8 @@ impl Configuration {
 	}
 
 	fn directories(&self) -> Directories {
+		use util::path;
+
 		let db_path = replace_home(self.args.flag_datadir.as_ref().unwrap_or(&self.args.flag_db_path));
 
 		let keys_path = replace_home(
@@ -524,6 +524,12 @@ impl Configuration {
 		let dapps_path = replace_home(&self.args.flag_dapps_path);
 		let signer_path = replace_home(&self.args.flag_signer_path);
 
+		if self.args.flag_geth {
+			let geth_path = path::ethereum::default();
+			::std::fs::create_dir_all(geth_path.as_path()).unwrap_or_else(
+				|e| warn!("Failed to create '{}' for geth mode: {}", &geth_path.to_str().unwrap(), e));
+		}
+
 		Directories {
 			keys: keys_path,
 			db: db_path,
@@ -771,8 +777,6 @@ mod tests {
 		assert_eq!(conf.network_settings(), NetworkSettings {
 			name: "testname".to_owned(),
 			chain: "morden".to_owned(),
-			max_peers: 50,
-			min_peers: 25,
 			network_port: 30303,
 			rpc_enabled: true,
 			rpc_interface: "local".to_owned(),

parity/informant.rs

@@ -21,7 +21,6 @@ use self::ansi_term::Style;
 use std::sync::{Arc};
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
 use std::time::{Instant, Duration};
-use std::ops::{Deref, DerefMut};
 use isatty::{stdout_isatty};
 use ethsync::{SyncProvider, ManageNetwork};
 use util::{Uint, RwLock, Mutex, H256, Colour};
@@ -112,7 +111,7 @@ impl Informant {
 					paint(White.bold(), format!("{:>8}", format!("#{}", chain_info.best_block_number))),
 					paint(White.bold(), format!("{}", chain_info.best_block_hash)),
 					{
-						let last_report = match write_report.deref() { &Some(ref last_report) => last_report.clone(), _ => ClientReport::default() };
+						let last_report = match *write_report { Some(ref last_report) => last_report.clone(), _ => ClientReport::default() };
 						format!("{} blk/s {} tx/s {} Mgas/s",
 							paint(Yellow.bold(), format!("{:4}", ((report.blocks_imported - last_report.blocks_imported) * 1000) as u64 / elapsed.as_milliseconds())),
 							paint(Yellow.bold(), format!("{:4}", ((report.transactions_applied - last_report.transactions_applied) * 1000) as u64 / elapsed.as_milliseconds())),
@@ -132,7 +131,7 @@ impl Informant {
 					},
 					paint(Cyan.bold(), format!("{:2}", sync_info.num_active_peers)),
 					paint(Cyan.bold(), format!("{:2}", sync_info.num_peers)),
-					paint(Cyan.bold(), format!("{:2}", if sync_info.num_peers as u32 > net_config.min_peers { net_config.max_peers} else { net_config.min_peers} ))
+					paint(Cyan.bold(), format!("{:2}", sync_info.current_max_peers(net_config.min_peers, net_config.max_peers))),
 				),
 				_ => String::new(),
 			},
@@ -147,9 +146,9 @@ impl Informant {
 			)
 		);
 
-		*self.chain_info.write().deref_mut() = Some(chain_info);
-		*self.cache_info.write().deref_mut() = Some(cache_info);
-		*write_report.deref_mut() = Some(report);
+		*self.chain_info.write() = Some(chain_info);
+		*self.cache_info.write() = Some(cache_info);
+		*write_report = Some(report);
 	}
 }
 

parity/rpc_apis.rs

@@ -186,7 +186,7 @@ pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet
 			},
 			Api::Ethcore => {
 				let queue = deps.signer_port.map(|_| deps.signer_queue.clone());
-				server.add_delegate(EthcoreClient::new(&deps.client, &deps.miner, deps.logger.clone(), deps.settings.clone(), queue).to_delegate())
+				server.add_delegate(EthcoreClient::new(&deps.client, &deps.miner, &deps.sync, &deps.net_service, deps.logger.clone(), deps.settings.clone(), queue).to_delegate())
 			},
 			Api::EthcoreSet => {
 				server.add_delegate(EthcoreSetClient::new(&deps.client, &deps.miner, &deps.net_service).to_delegate())

parity/run.rs

@@ -30,8 +30,6 @@ use ethcore::account_provider::AccountProvider;
 use ethcore::miner::{Miner, MinerService, ExternalMiner, MinerOptions};
 use ethsync::SyncConfig;
 use informant::Informant;
-#[cfg(feature="ipc")]
-use ethcore::client::ChainNotify;
 
 use rpc::{HttpServer, IpcServer, HttpConfiguration, IpcConfiguration};
 use signer::SignerServer;
@@ -82,9 +80,6 @@ pub struct RunCmd {
 }
 
 pub fn execute(cmd: RunCmd) -> Result<(), String> {
-	// create supervisor
-	let mut hypervisor = modules::hypervisor();
-
 	// increase max number of open files
 	raise_fd_limit();
 
@@ -167,6 +162,9 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 		net_conf.boot_nodes = spec.nodes.clone();
 	}
 
+	// create supervisor
+	let mut hypervisor = modules::hypervisor();
+
 	// create client service.
 	let service = try!(ClientService::start(
 		client_config,

parity/snapshot.rs

@@ -109,7 +109,7 @@ impl SnapshotCommand {
 		warn!("Snapshot restoration is experimental and the format may be subject to change.");
 
 		let snapshot = service.snapshot_service();
-		let reader = PackedReader::new(&Path::new(&file))
+		let reader = PackedReader::new(Path::new(&file))
 			.map_err(|e| format!("Couldn't open snapshot file: {}", e))
 			.and_then(|x| x.ok_or("Snapshot file has invalid format.".into()));
 
@@ -172,7 +172,7 @@ impl SnapshotCommand {
 	pub fn take_snapshot(self) -> Result<(), String> {
 		let file_path = try!(self.file_path.clone().ok_or("No file path provided.".to_owned()));
 		let file_path: PathBuf = file_path.into();
-		let block_at = self.block_at.clone();
+		let block_at = self.block_at;
 		let (service, _panic_handler) = try!(self.start_service());
 
 		warn!("Snapshots are currently experimental. File formats may be subject to change.");
@@ -180,7 +180,7 @@ impl SnapshotCommand {
 		let writer = try!(PackedWriter::new(&file_path)
 			.map_err(|e| format!("Failed to open snapshot writer: {}", e)));
 
-		let progress = Arc::new(Progress::new());
+		let progress = Arc::new(Progress::default());
 		let p = progress.clone();
 		let informant_handle = ::std::thread::spawn(move || {
 			::std::thread::sleep(Duration::from_secs(5));
@@ -221,4 +221,4 @@ pub fn execute(cmd: SnapshotCommand) -> Result<String, String> {
 	}
 
 	Ok(String::new())
-}
+}