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

Add header to cache

Browse Source
This commit is contained in:
Adrian Brink 2017-04-06 20:50:52 +02:00
parent 8a7ca6f0ba
commit 23c76caafa
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ethcore/light/src/client/header_chain.rs
View File

@ -365,22 +365,27 @@ impl HeaderChain {
/// will be returned. /// will be returned.
pub fn block_header(&self, id: BlockId) -> Option<encoded::Header> { pub fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
let load_from_db = |hash: H256| { let load_from_db = |hash: H256| {
let cached = {
let mut cache = self.cache.lock(); let mut cache = self.cache.lock();
cache.block_header(&hash) let header = cache.block_header(&hash);
};
if cached.is_some() { match header {
return cached Some(header) => Some(header),
} else { None => {
match self.db.get(self.col, &hash) { match self.db.get(self.col, &hash) {
Ok(val) => val.map(|x| x.to_vec()).map(encoded::Header::new), Ok(dbValue) => {
dbValue.map(|x| x.to_vec()).map(encoded::Header::new)
.and_then(|header| {
cache.insert_block_header(hash.clone(), header.clone());
Some(header)
})
},
Err(e) => { Err(e) => {
warn!(target: "chain", "Failed to read from database: {}", e); warn!(target: "chain", "Failed to read from database: {}", e);
None None
} }
} }
} }
}
}; };
match id { match id {
@ -423,7 +428,7 @@ impl HeaderChain {
} }
} }
/// Get the nth CHT root, if it has been computed. /// Get the nth CHT root, if it's been computed.
/// ///
/// CHT root 0 is from block `1..2048`. /// CHT root 0 is from block `1..2048`.
/// CHT root 1 is from block `2049..4096` /// CHT root 1 is from block `2049..4096`