Add transparent SSZ derive structs (#5)

* Update ssz crate Pulled from sigp/lighthouse/capella at e062a7cf768d2c492e2efa13febc14fe9ec66081 * Update ssz_derive Pulled from sigp/lighthouse/capella at e062a7cf768d2c492e2efa13febc14fe9ec66081 --------- Co-authored-by: Michael Sproul <[email protected]>
sigp · Mar 12, 2023 · af3a438 · af3a438
1 parent 473a4dc
commit af3a438
Show file tree

Hide file tree

Showing 6 changed files with 627 additions and 189 deletions.
diff --git a/ssz/src/decode/impls.rs b/ssz/src/decode/impls.rs
@@ -388,6 +388,7 @@ macro_rules! impl_decodable_for_u8_array {
 
 impl_decodable_for_u8_array!(4);
 impl_decodable_for_u8_array!(32);
+impl_decodable_for_u8_array!(48);
 
 macro_rules! impl_for_vec {
     ($type: ty, $max_len: expr) => {

diff --git a/ssz/src/encode/impls.rs b/ssz/src/encode/impls.rs
@@ -512,6 +512,7 @@ macro_rules! impl_encodable_for_u8_array {
 
 impl_encodable_for_u8_array!(4);
 impl_encodable_for_u8_array!(32);
+impl_encodable_for_u8_array!(48);
 
 #[cfg(test)]
 mod tests {

diff --git a/ssz/tests/tests.rs b/ssz/tests/tests.rs
@@ -388,145 +388,3 @@ mod round_trip {
         round_trip(data);
     }
 }
-
-mod derive_macro {
-    use ssz::{Decode, Encode};
-    use ssz_derive::{Decode, Encode};
-    use std::fmt::Debug;
-
-    fn assert_encode<T: Encode>(item: &T, bytes: &[u8]) {
-        assert_eq!(item.as_ssz_bytes(), bytes);
-    }
-
-    fn assert_encode_decode<T: Encode + Decode + PartialEq + Debug>(item: &T, bytes: &[u8]) {
-        assert_encode(item, bytes);
-        assert_eq!(T::from_ssz_bytes(bytes).unwrap(), *item);
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    #[ssz(enum_behaviour = "union")]
-    enum TwoFixedUnion {
-        U8(u8),
-        U16(u16),
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    struct TwoFixedUnionStruct {
-        a: TwoFixedUnion,
-    }
-
-    #[test]
-    fn two_fixed_union() {
-        let eight = TwoFixedUnion::U8(1);
-        let sixteen = TwoFixedUnion::U16(1);
-
-        assert_encode_decode(&eight, &[0, 1]);
-        assert_encode_decode(&sixteen, &[1, 1, 0]);
-
-        assert_encode_decode(&TwoFixedUnionStruct { a: eight }, &[4, 0, 0, 0, 0, 1]);
-        assert_encode_decode(&TwoFixedUnionStruct { a: sixteen }, &[4, 0, 0, 0, 1, 1, 0]);
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    struct VariableA {
-        a: u8,
-        b: Vec<u8>,
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    struct VariableB {
-        a: Vec<u8>,
-        b: u8,
-    }
-
-    #[derive(PartialEq, Debug, Encode)]
-    #[ssz(enum_behaviour = "transparent")]
-    enum TwoVariableTrans {
-        A(VariableA),
-        B(VariableB),
-    }
-
-    #[derive(PartialEq, Debug, Encode)]
-    struct TwoVariableTransStruct {
-        a: TwoVariableTrans,
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    #[ssz(enum_behaviour = "union")]
-    enum TwoVariableUnion {
-        A(VariableA),
-        B(VariableB),
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    struct TwoVariableUnionStruct {
-        a: TwoVariableUnion,
-    }
-
-    #[test]
-    fn two_variable_trans() {
-        let trans_a = TwoVariableTrans::A(VariableA {
-            a: 1,
-            b: vec![2, 3],
-        });
-        let trans_b = TwoVariableTrans::B(VariableB {
-            a: vec![1, 2],
-            b: 3,
-        });
-
-        assert_encode(&trans_a, &[1, 5, 0, 0, 0, 2, 3]);
-        assert_encode(&trans_b, &[5, 0, 0, 0, 3, 1, 2]);
-
-        assert_encode(
-            &TwoVariableTransStruct { a: trans_a },
-            &[4, 0, 0, 0, 1, 5, 0, 0, 0, 2, 3],
-        );
-        assert_encode(
-            &TwoVariableTransStruct { a: trans_b },
-            &[4, 0, 0, 0, 5, 0, 0, 0, 3, 1, 2],
-        );
-    }
-
-    #[test]
-    fn two_variable_union() {
-        let union_a = TwoVariableUnion::A(VariableA {
-            a: 1,
-            b: vec![2, 3],
-        });
-        let union_b = TwoVariableUnion::B(VariableB {
-            a: vec![1, 2],
-            b: 3,
-        });
-
-        assert_encode_decode(&union_a, &[0, 1, 5, 0, 0, 0, 2, 3]);
-        assert_encode_decode(&union_b, &[1, 5, 0, 0, 0, 3, 1, 2]);
-
-        assert_encode_decode(
-            &TwoVariableUnionStruct { a: union_a },
-            &[4, 0, 0, 0, 0, 1, 5, 0, 0, 0, 2, 3],
-        );
-        assert_encode_decode(
-            &TwoVariableUnionStruct { a: union_b },
-            &[4, 0, 0, 0, 1, 5, 0, 0, 0, 3, 1, 2],
-        );
-    }
-
-    #[derive(PartialEq, Debug, Encode, Decode)]
-    #[ssz(enum_behaviour = "union")]
-    enum TwoVecUnion {
-        A(Vec<u8>),
-        B(Vec<u8>),
-    }
-
-    #[test]
-    fn two_vec_union() {
-        assert_encode_decode(&TwoVecUnion::A(vec![]), &[0]);
-        assert_encode_decode(&TwoVecUnion::B(vec![]), &[1]);
-
-        assert_encode_decode(&TwoVecUnion::A(vec![0]), &[0, 0]);
-        assert_encode_decode(&TwoVecUnion::B(vec![0]), &[1, 0]);
-
-        assert_encode_decode(&TwoVecUnion::A(vec![0, 1]), &[0, 0, 1]);
-        assert_encode_decode(&TwoVecUnion::B(vec![0, 1]), &[1, 0, 1]);
-    }
-}
diff --git a/ssz_derive/Cargo.toml b/ssz_derive/Cargo.toml
@@ -19,3 +19,6 @@ syn = "1.0.42"
 proc-macro2 = "1.0.23"
 quote = "1.0.7"
 darling = "0.13.0"
+
+[dev-dependencies]
+ethereum_ssz = { version = "0.5.1", path = "../ssz" }