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

Don't allocate in expect_valid_rlp unless necessary (#8867)

Browse Source 
* don't allocate via format! in case there's no error

* fix test?
This commit is contained in:
Andronik Ordian 2018-06-12 09:15:52 +03:00 committed by Marek Kotewicz
parent 861d829420
commit 2a470deeaf
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ethcore/src/views/view_rlp.rs
View File

@ -53,7 +53,12 @@ impl<'a, 'view> ViewRlp<'a> where 'a : 'view {
} }
fn expect_valid_rlp<T>(&self, r: Result<T, DecoderError>) -> T { fn expect_valid_rlp<T>(&self, r: Result<T, DecoderError>) -> T {
r.expect(&format!("View rlp is trusted and should be valid. Constructed in {} on line {}", self.file, self.line)) r.unwrap_or_else(|e| panic!(
"View rlp is trusted and should be valid. Constructed in {} on line {}: {}",
self.file,
self.line,
e
))
} }
/// Returns rlp at the given index, panics if no rlp at that index /// Returns rlp at the given index, panics if no rlp at that index