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

Merge branch 'ssz-ints' into block_processing

Browse Source
This commit is contained in:
Paul Hauner 2018-09-19 17:50:20 +10:00
commit 24312f445e
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssz/src/encode.rs
View File

@ -60,20 +60,13 @@ impl SszStream {
/// The length of the list will be concatenated to the stream, then /// The length of the list will be concatenated to the stream, then
/// each item in the vector will be encoded and concatenated. /// each item in the vector will be encoded and concatenated.
pub fn append_vec<E>(&mut self, vec: &Vec<E>) pub fn append_vec<E>(&mut self, vec: &Vec<E>)
-> Result<(), EncodeError>
where E: Encodable where E: Encodable
{ {
let mut list_stream = SszStream::new(); let mut list_stream = SszStream::new();
for item in vec { for item in vec {
item.ssz_append(&mut list_stream); item.ssz_append(&mut list_stream);
} }
let list_ssz = list_stream.drain(); self.append_encoded_val(&list_stream.drain());
if list_ssz.len() <= MAX_LIST_SIZE {
self.append_encoded_val(&list_ssz);
Ok(())
} else {
Err(EncodeError::ListTooLong)
}
} }
/// Consume the stream and return the underlying bytes. /// Consume the stream and return the underlying bytes.
@ -142,7 +135,7 @@ mod tests {
fn test_encode_list() { fn test_encode_list() {
let test_vec: Vec<u16> = vec![256; 12]; let test_vec: Vec<u16> = vec![256; 12];
let mut stream = SszStream::new(); let mut stream = SszStream::new();
stream.append_vec(&test_vec).unwrap(); stream.append_vec(&test_vec);
let ssz = stream.drain(); let ssz = stream.drain();
assert_eq!(ssz.len(), 4 + (12 * 2)); assert_eq!(ssz.len(), 4 + (12 * 2));