Merge current master and fix ssz-fuzzing

eth2/utils/ssz/src/impl_decode.rs

@@ -24,11 +24,30 @@ macro_rules! impl_decodable_for_uint {
     };
 }
 
+macro_rules! impl_decodable_for_u8_array {
+    ($len: expr) => {
+        impl Decodable for [u8; $len] {
+            fn ssz_decode(bytes: &[u8], index: usize) -> Result<(Self, usize), DecodeError> {
+                if index + $len > bytes.len() {
+                    Err(DecodeError::TooShort)
+                } else {
+                    let mut array: [u8; $len] = [0; $len];
+                    array.copy_from_slice(&bytes[index..index + $len]);
+
+                    Ok((array, index + $len))
+                }
+            }
+        }
+    };
+}
+
 impl_decodable_for_uint!(u16, 16);
 impl_decodable_for_uint!(u32, 32);
 impl_decodable_for_uint!(u64, 64);
 impl_decodable_for_uint!(usize, 64);
 
+impl_decodable_for_u8_array!(4);
+
 impl Decodable for u8 {
     fn ssz_decode(bytes: &[u8], index: usize) -> Result<(Self, usize), DecodeError> {
         if index >= bytes.len() {
@@ -276,4 +295,12 @@ mod tests {
         let decoded_array: Result<Vec<u16>, DecodeError> = decode(&encoded);
         assert_eq!(decoded_array, Err(DecodeError::TooLong));
     }
+
+    #[test]
+    fn test_decode_u8_array() {
+        let ssz = vec![0, 1, 2, 3];
+        let result: [u8; 4] = decode(&ssz).unwrap();
+        assert_eq!(result.len(), 4);
+        assert_eq!(result, [0, 1, 2, 3]);
+    }
 }

eth2/utils/ssz/src/impl_encode.rs

@@ -40,12 +40,25 @@ macro_rules! impl_encodable_for_uint {
     };
 }
 
+macro_rules! impl_encodable_for_u8_array {
+    ($len: expr) => {
+        impl Encodable for [u8; $len] {
+            fn ssz_append(&self, s: &mut SszStream) {
+                let bytes: Vec<u8> = self.iter().cloned().collect();
+                s.append_encoded_raw(&bytes);
+            }
+        }
+    };
+}
+
 impl_encodable_for_uint!(u8, 8);
 impl_encodable_for_uint!(u16, 16);
 impl_encodable_for_uint!(u32, 32);
 impl_encodable_for_uint!(u64, 64);
 impl_encodable_for_uint!(usize, 64);
 
+impl_encodable_for_u8_array!(4);
+
 impl Encodable for bool {
     fn ssz_append(&self, s: &mut SszStream) {
         let byte = if *self { 0b0000_0001 } else { 0b0000_0000 };
@@ -77,6 +90,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::ssz_encode;
 
     #[test]
     fn test_ssz_encode_h256() {
@@ -247,4 +261,15 @@ mod tests {
         ssz.append(&x);
         assert_eq!(ssz.drain(), vec![0b0000_0001]);
     }
+
+    #[test]
+    fn test_ssz_encode_u8_array() {
+        let x: [u8; 4] = [0, 1, 7, 8];
+        let ssz = ssz_encode(&x);
+        assert_eq!(ssz, vec![0, 1, 7, 8]);
+
+        let x: [u8; 4] = [255, 255, 255, 255];
+        let ssz = ssz_encode(&x);
+        assert_eq!(ssz, vec![255, 255, 255, 255]);
+    }
 }