cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

redundant if and type conversion change

Browse Source
This commit is contained in:
Grant Wuerker 2018-10-20 14:20:23 -05:00
parent 2fb9dfbf14
commit ba65bdfc6a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_chain/utils/ssz/src/impl_decode.rs
View File

@ -20,7 +20,7 @@ macro_rules! impl_decodable_for_uint {
let mut result: $type = 0; let mut result: $type = 0;
for i in index..end_bytes { for i in index..end_bytes {
let offset = ((index + max_bytes) - i - 1) * 8; let offset = ((index + max_bytes) - i - 1) * 8;
result = ((bytes[i] as $type) << offset) | result; result |= ($type::from(bytes[i])) << offset;
}; };
Ok((result, end_bytes)) Ok((result, end_bytes))
} else { } else {
@ -52,10 +52,7 @@ impl Decodable for H256 {
fn ssz_decode(bytes: &[u8], index: usize) fn ssz_decode(bytes: &[u8], index: usize)
-> Result<(Self, usize), DecodeError> -> Result<(Self, usize), DecodeError>
{ {
if bytes.len() < 32 { if bytes.len() < 32 || bytes.len() - 32 < index {
return Err(DecodeError::TooShort)
}
else if bytes.len() - 32 < index {
return Err(DecodeError::TooShort) return Err(DecodeError::TooShort)
} }
else { else {