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

Update SszBlock to use new SSZ API

Browse Source
This commit is contained in:
Paul Hauner 2018-09-19 14:52:36 +10:00
parent a8a49a4e2f
commit fe2127ea31
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lighthouse/state/block/ssz_block.rs
View File

@ -33,13 +33,14 @@ impl<'a> SszBlock<'a> {
pub fn from_vec(vec: &'a Vec<u8>) pub fn from_vec(vec: &'a Vec<u8>)
-> Result<Self, BlockValidatorError> -> Result<Self, BlockValidatorError>
{ {
let ssz = &vec[..];
if vec.len() < MIN_SSZ_BLOCK_LENGTH { if vec.len() < MIN_SSZ_BLOCK_LENGTH {
return Err(BlockValidatorError::SszInvalid); return Err(BlockValidatorError::SszInvalid);
} }
if vec.len() > MAX_SSZ_BLOCK_LENGTH { if vec.len() > MAX_SSZ_BLOCK_LENGTH {
return Err(BlockValidatorError::SszInvalid); return Err(BlockValidatorError::SszInvalid);
} }
let attestation_len = decode_length(&vec[72..76], LENGTH_BYTES) let attestation_len = decode_length(ssz, 72, LENGTH_BYTES)
.map_err(|_| BlockValidatorError::SszInvalid)?; .map_err(|_| BlockValidatorError::SszInvalid)?;
// Is the length adequate now we know now many attestation // Is the length adequate now we know now many attestation
// records exist? // records exist?
@ -47,7 +48,7 @@ impl<'a> SszBlock<'a> {
return Err(BlockValidatorError::SszInvalid); return Err(BlockValidatorError::SszInvalid);
} }
Ok(Self{ Ok(Self{
ssz: &vec[..], ssz,
attestation_len attestation_len
}) })
} }
@ -61,7 +62,7 @@ impl<'a> SszBlock<'a> {
} }
pub fn slot_number(&self) -> u64 { pub fn slot_number(&self) -> u64 {
u64::ssz_decode(&self.ssz[32..40]).unwrap() u64::ssz_decode(&self.ssz, 32).unwrap().0
} }
pub fn randao_reveal(&self) -> &[u8] { pub fn randao_reveal(&self) -> &[u8] {