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

group best block info together in blockchain

Browse Source
This commit is contained in:
debris 2015-12-21 02:57:02 +01:00
parent 0164ce4b19
commit 491cc29a09
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/blockchain.rs
View File

@ -1,7 +1,7 @@
//! Fast access to blockchain data. //! Fast access to blockchain data.
use std::collections::HashMap; use std::collections::HashMap;
use std::cell::{Cell, RefCell}; use std::cell::RefCell;
use std::path::Path; use std::path::Path;
use std::hash::Hash; use std::hash::Hash;
use rocksdb::{DB, WriteBatch, Writable}; use rocksdb::{DB, WriteBatch, Writable};
@ -41,13 +41,28 @@ pub struct CacheSize {
pub blocks_blooms: usize pub blocks_blooms: usize
} }
/// Grouped information about best block
struct BestBlock {
pub hash: H256,
pub number: U256,
pub total_difficulty: U256
}
impl BestBlock {
fn new() -> BestBlock {
BestBlock {
hash: H256::new(),
number: U256::from(0),
total_difficulty: U256::from(0)
}
}
}
/// Structure providing fast access to blockchain data. /// Structure providing fast access to blockchain data.
/// ///
/// **Does not do input data verifycation.** /// **Does not do input data verifycation.**
pub struct BlockChain { pub struct BlockChain {
best_block_hash: RefCell<H256>, best_block: RefCell<BestBlock>,
best_block_number: Cell<U256>,
best_block_total_difficulty: Cell<U256>,
// block cache // block cache
blocks: RefCell<HashMap<H256, Bytes>>, blocks: RefCell<HashMap<H256, Bytes>>,
@ -102,9 +117,7 @@ impl BlockChain {
let blocks_db = DB::open_default(blocks_path.to_str().unwrap()).unwrap(); let blocks_db = DB::open_default(blocks_path.to_str().unwrap()).unwrap();
let bc = BlockChain { let bc = BlockChain {
best_block_hash: RefCell::new(H256::new()), best_block: RefCell::new(BestBlock::new()),
best_block_number: Cell::new(U256::from(0u8)),
best_block_total_difficulty: Cell::new(U256::from(0u8)),
blocks: RefCell::new(HashMap::new()), blocks: RefCell::new(HashMap::new()),
block_details: RefCell::new(HashMap::new()), block_details: RefCell::new(HashMap::new()),
block_hashes: RefCell::new(HashMap::new()), block_hashes: RefCell::new(HashMap::new()),
@ -144,9 +157,12 @@ impl BlockChain {
} }
}; };
bc.best_block_number.set(bc.block_number(&best_block_hash).unwrap()); {
bc.best_block_total_difficulty.set(bc.block_details(&best_block_hash).unwrap().total_difficulty); let mut best_block = bc.best_block.borrow_mut();
*bc.best_block_hash.borrow_mut() = best_block_hash; best_block.number = bc.block_number(&best_block_hash).unwrap();
best_block.total_difficulty = bc.block_details(&best_block_hash).unwrap().total_difficulty;
best_block.hash = best_block_hash;
}
bc bc
} }
@ -325,9 +341,10 @@ impl BlockChain {
self.extras_db.write(extras_batch).unwrap(); self.extras_db.write(extras_batch).unwrap();
// update local caches // update local caches
*self.best_block_hash.borrow_mut() = hash; let mut best_block = self.best_block.borrow_mut();
self.best_block_number.set(header.number()); best_block.hash = hash;
self.best_block_total_difficulty.set(total_difficulty); best_block.number = header.number();
best_block.total_difficulty = total_difficulty;
} }
} }
@ -388,17 +405,17 @@ impl BlockChain {
/// Get best block hash. /// Get best block hash.
pub fn best_block_hash(&self) -> H256 { pub fn best_block_hash(&self) -> H256 {
self.best_block_hash.borrow().clone() self.best_block.borrow().hash.clone()
} }
/// Get best block number. /// Get best block number.
pub fn best_block_number(&self) -> U256 { pub fn best_block_number(&self) -> U256 {
self.best_block_number.get() self.best_block.borrow().number
} }
/// Get best block total difficulty. /// Get best block total difficulty.
pub fn best_block_total_difficulty(&self) -> U256 { pub fn best_block_total_difficulty(&self) -> U256 {
self.best_block_total_difficulty.get() self.best_block.borrow().total_difficulty
} }
/// Get the number of given block's hash. /// Get the number of given block's hash.