GlcoinCore/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2026-08-19 13:17:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Simplify parse_block_and_undo

Browse source
This commit is contained in:
Roman Zeyde 2020-11-15 20:00:00 +02:00
parent ca09e30b03
commit 8c1917abe2
No known key found for this signature in database
GPG key ID: 87CAE5FA46917CBB
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
electrs_index/src/index.rs
View file

@ -553,21 +553,19 @@ fn parse_block_and_undo<F>(loc: BlockLocation, blk_file: &mut F, undo_file: &mut
where
F: Read + Seek,
{
blk_file
.seek(SeekFrom::Start(loc.data as u64))
.expect("failed to seek");
let block: Block =
parse_from(blk_file, loc.data).unwrap_or_else(|_| panic!("bad Block at {:?}", loc));
let undo: BlockUndo = loc
.undo
.map(|offset| {
parse_from(undo_file, offset).unwrap_or_else(|_| panic!("bad BlockUndo at {:?}", loc))
})
.unwrap_or_else(|| {
let block: Block = match parse_from(blk_file, loc.data) {
Ok(block) => block,
Err(err) => panic!("bad Block at {:?}: {}", loc, err),
};
let undo: BlockUndo = match loc.undo.map(|offset| parse_from(undo_file, offset)) {
Some(Ok(undo)) => undo,
Some(Err(err)) => panic!("bad BlockUndo at {:?}: {}", loc, err),
None => {
// genesis block has no undo
assert_eq!(block.header.prev_blockhash, BlockHash::default());
BlockUndo::default() // create an empty undo
});
}
};
ParseResult { loc, block, undo }
}