Merge branches 'kill_unwraps' and 'dynamic-gas-price' of github.com:ethcore/parity into dynamic-gas-price

parity/hypervisor/mod.rs

@@ -20,19 +20,18 @@
 #![allow(dead_code)]
 #![cfg_attr(feature="dev", allow(used_underscore_binding))]
 
-pub mod service;
-
-/// Default value for hypervisor ipc listener
-pub const HYPERVISOR_IPC_URL: &'static str = "ipc:///tmp/parity-internal-hyper-status.ipc";
-
 use nanoipc;
 use std::sync::{Arc,RwLock};
 use hypervisor::service::*;
 use std::process::{Command,Child};
 use std::collections::HashMap;
 
-type BinaryId = &'static str;
+pub mod service;
 
+/// Default value for hypervisor ipc listener
+pub const HYPERVISOR_IPC_URL: &'static str = "ipc:///tmp/parity-internal-hyper-status.ipc";
+
+type BinaryId = &'static str;
 const BLOCKCHAIN_DB_BINARY: BinaryId = "blockchain";
 
 pub struct Hypervisor {

parity/informant.rs

@@ -22,7 +22,7 @@ use std::time::{Instant, Duration};
 use std::sync::RwLock;
 use std::ops::{Deref, DerefMut};
 use ethsync::{EthSync, SyncProvider};
-use util::{Uint, NetworkService};
+use util::{Uint, RwLockable, NetworkService};
 use ethcore::client::*;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
 
@@ -77,18 +77,18 @@ impl Informant {
 
 	#[cfg_attr(feature="dev", allow(match_bool))]
 	pub fn tick<Message>(&self, client: &Client, maybe_sync: Option<(&EthSync, &NetworkService<Message>)>) where Message: Send + Sync + Clone + 'static {
-		let elapsed = self.last_tick.read().unwrap().elapsed();
+		let elapsed = self.last_tick.unwrapped_read().elapsed();
 		if elapsed < Duration::from_secs(5) {
 			return;
 		}
 
-		*self.last_tick.write().unwrap() = Instant::now();
+		*self.last_tick.unwrapped_write() = Instant::now();
 
 		let chain_info = client.chain_info();
 		let queue_info = client.queue_info();
 		let cache_info = client.blockchain_cache_info();
 
-		let mut write_report = self.report.write().unwrap();
+		let mut write_report = self.report.unwrapped_write();
 		let report = client.report();
 
 		let paint = |c: Style, t: String| match self.with_color {
@@ -97,8 +97,8 @@ impl Informant {
 		};
 
 		if let (_, _, &Some(ref last_report)) = (
-			self.chain_info.read().unwrap().deref(),
-			self.cache_info.read().unwrap().deref(),
+			self.chain_info.unwrapped_read().deref(),
+			self.cache_info.unwrapped_read().deref(),
 			write_report.deref()
 		) {
 			println!("{} {}   {} blk/s {} tx/s {} Mgas/s   {}{}+{} Qed   {} db {} chain {} queue{}",
@@ -139,8 +139,8 @@ impl Informant {
 			);
 		}
 
-		*self.chain_info.write().unwrap().deref_mut() = Some(chain_info);
-		*self.cache_info.write().unwrap().deref_mut() = Some(cache_info);
+		*self.chain_info.unwrapped_write().deref_mut() = Some(chain_info);
+		*self.cache_info.unwrapped_write().deref_mut() = Some(cache_info);
 		*write_report.deref_mut() = Some(report);
 	}
 }

parity/main.rs

@@ -79,7 +79,7 @@ use std::thread::sleep;
 use std::time::Duration;
 use rustc_serialize::hex::FromHex;
 use ctrlc::CtrlC;
-use util::{H256, ToPretty, NetworkConfiguration, PayloadInfo, Bytes, UtilError, Colour, Applyable, version, journaldb};
+use util::{Lockable, H256, ToPretty, NetworkConfiguration, PayloadInfo, Bytes, UtilError, Colour, Applyable, version, journaldb};
 use util::panics::{MayPanic, ForwardPanic, PanicHandler};
 use ethcore::client::{Mode, BlockID, BlockChainClient, ClientConfig, get_db_path, BlockImportError};
 use ethcore::error::{ImportError};
@@ -612,7 +612,7 @@ fn wait_for_exit(
 
 	// Wait for signal
 	let mutex = Mutex::new(());
-	let _ = exit.wait(mutex.lock().unwrap()).unwrap();
+	let _ = exit.wait(mutex.locked()).unwrap();
 	info!("Finishing work, please wait...");
 }