Cleanup payload types

beacon_node/beacon_chain/Cargo.toml

@@ -33,7 +33,7 @@ slot_clock = { path = "../../common/slot_clock" }
 eth2_hashing = "0.3.0"
 eth2_ssz = "0.4.1"
 eth2_ssz_types = "0.2.2"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 state_processing = { path = "../../consensus/state_processing" }
 tree_hash = "0.4.1"
 types = { path = "../../consensus/types" }

beacon_node/eth1/Cargo.toml

@@ -21,7 +21,7 @@ hex = "0.4.2"
 types = { path = "../../consensus/types"}
 merkle_proof = { path = "../../consensus/merkle_proof"}
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 tree_hash = "0.4.1"
 parking_lot = "0.12.0"
 slog = "2.5.2"

beacon_node/operation_pool/Cargo.toml

@@ -13,7 +13,7 @@ parking_lot = "0.12.0"
 types = { path = "../../consensus/types" }
 state_processing = { path = "../../consensus/state_processing" }
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 rayon = "1.5.0"
 serde = "1.0.116"
 serde_derive = "1.0.116"

beacon_node/store/Cargo.toml

@@ -14,7 +14,7 @@ leveldb = { version = "0.8.6", default-features = false }
 parking_lot = "0.12.0"
 itertools = "0.10.0"
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 types = { path =  "../../consensus/types" }
 state_processing = { path = "../../consensus/state_processing" }
 slog = "2.5.2"

common/eth2/Cargo.toml

@@ -21,7 +21,7 @@ bytes = "1.0.1"
 account_utils = { path = "../../common/account_utils" }
 sensitive_url = { path = "../../common/sensitive_url" }
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 futures-util = "0.3.8"
 futures = "0.3.8"
 store = { path = "../../beacon_node/store", optional = true }

consensus/cached_tree_hash/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 ethereum-types = "0.12.1"
 eth2_ssz_types = "0.2.2"
 eth2_hashing = "0.3.0"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 eth2_ssz = "0.4.1"
 tree_hash = "0.4.1"
 smallvec = "1.6.1"

consensus/fork_choice/Cargo.toml

@@ -11,7 +11,7 @@ types = { path = "../types" }
 state_processing = { path = "../state_processing" }
 proto_array = { path = "../proto_array" }
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
 
 [dev-dependencies]

consensus/proto_array/Cargo.toml

@@ -11,7 +11,7 @@ path = "src/bin.rs"
 [dependencies]
 types = { path = "../types" }
 eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 serde_yaml = "0.8.13"

consensus/ssz/Cargo.toml

@@ -10,7 +10,7 @@ license = "Apache-2.0"
 name = "ssz"
 
 [dev-dependencies]
-eth2_ssz_derive = "0.3.0"
+eth2_ssz_derive = "0.3.1"
 
 [dependencies]
 ethereum-types = "0.12.1"

consensus/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]);
-    }
-}

consensus/ssz_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "eth2_ssz_derive"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Paul Hauner <paul@sigmaprime.io>"]
 edition = "2021"
 description = "Procedural derive macros to accompany the eth2_ssz crate."
@@ -15,3 +15,6 @@ syn = "1.0.42"
 proc-macro2 = "1.0.23"
 quote = "1.0.7"
 darling = "0.13.0"
+
+[dev-dependencies]
+eth2_ssz = "0.4.1"