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

Insert PROOF messages for some cases in blockchain (#9141)

Browse Source 
* Insert PROOF messages for some cases in blockchain

* Break expect to its own line to avoid things being too long

* Be more specific for all low-level database error cases

* Fix BranchBecomingCanonChain expect

* ethcore: fix typo in expect proof message
This commit is contained in:
Wei Tang 2018-07-26 00:45:06 +08:00 committed by André Silva
parent 823054dc34
commit 5795d332c8
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ethcore/src/blockchain/blockchain.rs
View File

@ -270,7 +270,7 @@ impl BlockProvider for BlockChain {
// Read from DB and populate cache // Read from DB and populate cache
let b = self.db.key_value().get(db::COL_HEADERS, hash) let b = self.db.key_value().get(db::COL_HEADERS, hash)
.expect("Low level database error. Some issue with disk?")?; .expect("Low level database error when fetching block header data. Some issue with disk?")?;
let header = encoded::Header::new(decompress(&b, blocks_swapper()).into_vec()); let header = encoded::Header::new(decompress(&b, blocks_swapper()).into_vec());
let mut write = self.block_headers.write(); let mut write = self.block_headers.write();
@ -300,7 +300,7 @@ impl BlockProvider for BlockChain {
// Read from DB and populate cache // Read from DB and populate cache
let b = self.db.key_value().get(db::COL_BODIES, hash) let b = self.db.key_value().get(db::COL_BODIES, hash)
.expect("Low level database error. Some issue with disk?")?; .expect("Low level database error when fetching block body data. Some issue with disk?")?;
let body = encoded::Body::new(decompress(&b, blocks_swapper()).into_vec()); let body = encoded::Body::new(decompress(&b, blocks_swapper()).into_vec());
let mut write = self.block_bodies.write(); let mut write = self.block_bodies.write();
@ -346,7 +346,7 @@ impl BlockProvider for BlockChain {
I: Iterator<Item = B> { I: Iterator<Item = B> {
self.db.blooms() self.db.blooms()
.filter(from_block, to_block, blooms) .filter(from_block, to_block, blooms)
.expect("Low level database error. Some issue with disk?") .expect("Low level database error when searching blooms. Some issue with disk?")
} }
/// Returns logs matching given filter. The order of logs returned will be the same as the order of the blocks /// Returns logs matching given filter. The order of logs returned will be the same as the order of the blocks
@ -536,7 +536,9 @@ impl BlockChain {
}; };
// load best block // load best block
let best_block_hash = match bc.db.key_value().get(db::COL_EXTRA, b"best").unwrap() { let best_block_hash = match bc.db.key_value().get(db::COL_EXTRA, b"best")
.expect("Low-level database error when fetching 'best' block. Some issue with disk?")
{
Some(best) => { Some(best) => {
H256::from_slice(&best) H256::from_slice(&best)
} }
@ -564,15 +566,18 @@ impl BlockChain {
batch.write(db::COL_EXTRA, &header.number(), &hash); batch.write(db::COL_EXTRA, &header.number(), &hash);
batch.put(db::COL_EXTRA, b"best", &hash); batch.put(db::COL_EXTRA, b"best", &hash);
bc.db.key_value().write(batch).expect("Low level database error. Some issue with disk?"); bc.db.key_value().write(batch).expect("Low level database error when fetching 'best' block. Some issue with disk?");
hash hash
} }
}; };
{ {
// Fetch best block details // Fetch best block details
let best_block_total_difficulty = bc.block_details(&best_block_hash).unwrap().total_difficulty; let best_block_total_difficulty = bc.block_details(&best_block_hash)
let best_block_rlp = bc.block(&best_block_hash).unwrap(); .expect("Best block is from a known block hash; a known block hash always comes with a known block detail; qed")
.total_difficulty;
let best_block_rlp = bc.block(&best_block_hash)
.expect("Best block is from a known block hash; qed");
// and write them // and write them
let mut best_block = bc.best_block.write(); let mut best_block = bc.best_block.write();
@ -586,8 +591,12 @@ impl BlockChain {
{ {
let best_block_number = bc.best_block.read().header.number(); let best_block_number = bc.best_block.read().header.number();
// Fetch first and best ancient block details // Fetch first and best ancient block details
let raw_first = bc.db.key_value().get(db::COL_EXTRA, b"first").unwrap().map(|v| v.into_vec()); let raw_first = bc.db.key_value().get(db::COL_EXTRA, b"first")
let mut best_ancient = bc.db.key_value().get(db::COL_EXTRA, b"ancient").unwrap().map(|h| H256::from_slice(&h)); .expect("Low level database error when fetching 'first' block. Some issue with disk?")
.map(|v| v.into_vec());
let mut best_ancient = bc.db.key_value().get(db::COL_EXTRA, b"ancient")
.expect("Low level database error when fetching 'best ancient' block. Some issue with disk?")
.map(|h| H256::from_slice(&h));
let best_ancient_number; let best_ancient_number;
if best_ancient.is_none() && best_block_number > 1 && bc.block_hash(1).is_none() { if best_ancient.is_none() && best_block_number > 1 && bc.block_hash(1).is_none() {
best_ancient = Some(bc.genesis_hash()); best_ancient = Some(bc.genesis_hash());
@ -618,7 +627,7 @@ impl BlockChain {
trace!("First block calculated: {:?}", hash); trace!("First block calculated: {:?}", hash);
let mut batch = db.key_value().transaction(); let mut batch = db.key_value().transaction();
batch.put(db::COL_EXTRA, b"first", &hash); batch.put(db::COL_EXTRA, b"first", &hash);
db.key_value().write(batch).expect("Low level database error."); db.key_value().write(batch).expect("Low level database error when writing 'first' block. Some issue with disk?");
bc.first_block = Some(hash); bc.first_block = Some(hash);
} }
}, },
@ -1072,7 +1081,7 @@ impl BlockChain {
if let Some((block, blooms)) = update.blocks_blooms { if let Some((block, blooms)) = update.blocks_blooms {
self.db.blooms() self.db.blooms()
.insert_blooms(block, blooms.iter()) .insert_blooms(block, blooms.iter())
.expect("Low level database error. Some issue with disk?"); .expect("Low level database error when updating blooms. Some issue with disk?");
} }
// These cached values must be updated last with all four locks taken to avoid // These cached values must be updated last with all four locks taken to avoid
@ -1350,11 +1359,13 @@ impl BlockChain {
} }
}, },
BlockLocation::BranchBecomingCanonChain(ref data) => { BlockLocation::BranchBecomingCanonChain(ref data) => {
let ancestor_number = self.block_number(&data.ancestor).unwrap(); let ancestor_number = self.block_number(&data.ancestor)
.expect("hash belongs to an ancestor of an inserted block; this branch is only reachable for normal block insertion (non-ancient); ancestors of an inserted block are always available for normal block insertion; block number of an inserted block is always available; qed");
let start_number = ancestor_number + 1; let start_number = ancestor_number + 1;
let mut blooms: Vec<Bloom> = data.enacted.iter() let mut blooms: Vec<Bloom> = data.enacted.iter()
.map(|hash| self.block_header_data(hash).unwrap()) .map(|hash| self.block_header_data(hash)
.expect("hash belongs to an inserted block; block header data of an inserted block is always available; qed"))
.map(|h| h.log_bloom()) .map(|h| h.log_bloom())
.collect(); .collect();