gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't squash caught errors, please (#15046) (#15049)

Browse Source 
* Don't squash caught errors, please

* Update blockstore.rs

* Update blockstore.rs

(cherry picked from commit 8376781ec8)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
mergify[bot]
2021-02-03 16:33:53 +00:00
committed by GitHub
parent a7193ce834
commit 4e60f95854
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ledger/src/blockstore.rs
View File

@ -487,8 +487,9 @@ impl Blockstore {
Ok(meta_iter.map(|(slot, slot_meta_bytes)| { Ok(meta_iter.map(|(slot, slot_meta_bytes)| {
( (
slot, slot,
deserialize(&slot_meta_bytes) deserialize(&slot_meta_bytes).unwrap_or_else(|e| {
.unwrap_or_else(|_| panic!("Could not deserialize SlotMeta for slot {}", slot)), panic!("Could not deserialize SlotMeta for slot {}: {:?}", slot, e)
}),
) )
})) }))
} }
@ -2598,10 +2599,11 @@ impl Blockstore {
})?; })?;
debug!("{:?} shreds in last FEC set", data_shreds.len(),); debug!("{:?} shreds in last FEC set", data_shreds.len(),);
bincode::deserialize::<Vec<Entry>>(&deshred_payload).map_err(|_| { bincode::deserialize::<Vec<Entry>>(&deshred_payload).map_err(|e| {
BlockstoreError::InvalidShredData(Box::new(bincode::ErrorKind::Custom( BlockstoreError::InvalidShredData(Box::new(bincode::ErrorKind::Custom(format!(
"could not reconstruct entries".to_string(), "could not reconstruct entries: {:?}",
))) e
))))
}) })
} }