grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'parity/master' into bft

Browse Source
This commit is contained in:
keorn
2016-11-07 11:34:45 +00:00
parent 214916a414 b3d502ba78
commit ea960f1c27
1245 changed files with 71972 additions and 5008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/src/spec/spec.rs
View File

@@ -16,10 +16,12 @@
//! Parameters for a block chain.
use common::*;
use util::*;
use builtin::Builtin;
use engines::{Engine, NullEngine, InstantSeal, BasicAuthority, Tendermint};
use pod_state::*;
use account_db::*;
use header::{BlockNumber, Header};
use state_db::StateDB;
use super::genesis::Genesis;
use super::seal::Generic as GenericSeal;
@@ -151,7 +153,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.