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

simplify conditional in state_at

Browse Source
This commit is contained in:
Robert Habermeier 2016-06-05 22:05:01 +02:00
parent aa465fa2cd
commit e6921144dc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,11 +379,8 @@ impl<V> Client<V> where V: Verifier {
self.block_header(id).and_then(|header| { self.block_header(id).and_then(|header| {
let db = self.state_db.lock().unwrap().boxed_clone(); let db = self.state_db.lock().unwrap().boxed_clone();
// check that the block is not too old -- blocks within `HISTORY` blocks of the best will // TODO [rob]: refactor State::from_existing so we avoid doing redundant lookups.
// always be available. If the block could be too old, check if its state root is valid. if !db.contains(&root) {
let root = HeaderView::new(&header).state_root();
let is_old = self.chain.best_block_number() >= block_number + HISTORY;
if db.is_pruned() && is_old && !db.contains(&root) {
return None; return None;
} }