From aa465fa2cdbbeafa899b42ede17e879ad037d8ae Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Fri, 3 Jun 2016 12:15:27 +0200 Subject: [PATCH] conditional style fix --- ethcore/src/client/client.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index f74fb33f5..83b9e30ef 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -379,12 +379,11 @@ impl Client where V: Verifier { self.block_header(id).and_then(|header| { let db = self.state_db.lock().unwrap().boxed_clone(); - let root = HeaderView::new(&header).state_root(); // check that the block is not too old -- blocks within `HISTORY` blocks of the best will // always be available. If the block could be too old, check if its state root is valid. - if db.is_pruned() - && self.chain.best_block_number() >= block_number + HISTORY - && !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; }