Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet

2016-10-24 15:32:30 +01:00
parent 303f922ebd 9150fce2f1
commit aa05823afe
1204 changed files with 65392 additions and 2958 deletions
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -151,7 +151,8 @@ impl Spec {
 		if self.state_root_memo.read().is_none() {
 			*self.state_root_memo.write() = Some(self.genesis_state.root());
 		}
-		self.state_root_memo.read().as_ref().unwrap().clone()
+		self.state_root_memo.read().as_ref().cloned()
+			.expect("state root memo ensured to be set at this point; qed")
 	}

 	/// Get the known knodes of the network in enode format.