Merge remote-tracking branch 'origin/unstable' into tree-states

consensus/ssz/src/decode/impls.rs

@@ -246,6 +246,20 @@ impl Decode for NonZeroUsize {
     }
 }
 
+impl<T: Decode> Decode for Option<T> {
+    fn is_ssz_fixed_len() -> bool {
+        false
+    }
+    fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
+        let (selector, body) = split_union_bytes(bytes)?;
+        match selector.into() {
+            0u8 => Ok(None),
+            1u8 => <T as Decode>::from_ssz_bytes(body).map(Option::Some),
+            other => Err(DecodeError::UnionSelectorInvalid(other)),
+        }
+    }
+}
+
 impl<T: Decode> Decode for Arc<T> {
     fn is_ssz_fixed_len() -> bool {
         T::is_ssz_fixed_len()

consensus/ssz/src/encode/impls.rs

@@ -203,6 +203,34 @@ impl_encode_for_tuples! {
     }
 }
 
+impl<T: Encode> Encode for Option<T> {
+    fn is_ssz_fixed_len() -> bool {
+        false
+    }
+    fn ssz_append(&self, buf: &mut Vec<u8>) {
+        match self {
+            Option::None => {
+                let union_selector: u8 = 0u8;
+                buf.push(union_selector);
+            }
+            Option::Some(ref inner) => {
+                let union_selector: u8 = 1u8;
+                buf.push(union_selector);
+                inner.ssz_append(buf);
+            }
+        }
+    }
+    fn ssz_bytes_len(&self) -> usize {
+        match self {
+            Option::None => 1usize,
+            Option::Some(ref inner) => inner
+                .ssz_bytes_len()
+                .checked_add(1)
+                .expect("encoded length must be less than usize::max_value"),
+        }
+    }
+}
+
 impl<T: Encode> Encode for Arc<T> {
     fn is_ssz_fixed_len() -> bool {
         T::is_ssz_fixed_len()
@@ -562,6 +590,14 @@ mod tests {
         );
     }
 
+    #[test]
+    fn ssz_encode_option_u8() {
+        let opt: Option<u8> = None;
+        assert_eq!(opt.as_ssz_bytes(), vec![0]);
+        let opt: Option<u8> = Some(2);
+        assert_eq!(opt.as_ssz_bytes(), vec![1, 2]);
+    }
+
     #[test]
     fn ssz_encode_bool() {
         assert_eq!(true.as_ssz_bytes(), vec![1]);

consensus/ssz/tests/tests.rs

@@ -22,6 +22,13 @@ mod round_trip {
         round_trip(items);
     }
 
+    #[test]
+    fn option_u16() {
+        let items: Vec<Option<u16>> = vec![None, Some(2u16)];
+
+        round_trip(items);
+    }
+
     #[test]
     fn u8_array_4() {
         let items: Vec<[u8; 4]> = vec![[0, 0, 0, 0], [1, 0, 0, 0], [1, 2, 3, 4], [1, 2, 0, 4]];
@@ -46,6 +53,17 @@ mod round_trip {
         round_trip(items);
     }
 
+    #[test]
+    fn option_vec_h256() {
+        let items: Vec<Option<Vec<H256>>> = vec![
+            None,
+            Some(vec![]),
+            Some(vec![H256::zero(), H256::from([1; 32]), H256::random()]),
+        ];
+
+        round_trip(items);
+    }
+
     #[test]
     fn vec_u16() {
         let items: Vec<Vec<u16>> = vec![