cleanup

Author: eserilev

consensus/types/src/light_client_bootstrap.rs

@@ -145,3 +145,11 @@ impl<E: EthSpec> ForkVersionDeserialize for LightClientBootstrap<E> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::MainnetEthSpec;
+
+    ssz_tests!(LightClientBootstrapDeneb<MainnetEthSpec>);
+}

consensus/types/src/light_client_finality_update.rs

@@ -175,3 +175,11 @@ impl<E: EthSpec> ForkVersionDeserialize for LightClientFinalityUpdate<E> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::MainnetEthSpec;
+
+    ssz_tests!(LightClientFinalityUpdateDeneb<MainnetEthSpec>);
+}

consensus/types/src/light_client_optimistic_update.rs

@@ -169,3 +169,11 @@ impl<T: EthSpec> ForkVersionDeserialize for LightClientOptimisticUpdate<T> {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::MainnetEthSpec;
+
+    ssz_tests!(LightClientOptimisticUpdateDeneb<MainnetEthSpec>);
+}

consensus/types/src/light_client_update.rs

@@ -264,8 +264,11 @@ impl<E: EthSpec> LightClientUpdate<E> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::MainnetEthSpec;
     use ssz_types::typenum::Unsigned;
 
+    ssz_tests!(LightClientUpdateDeneb<MainnetEthSpec>);
+
     #[test]
     fn finalized_root_params() {
         assert!(2usize.pow(FINALIZED_ROOT_PROOF_LEN as u32) <= FINALIZED_ROOT_INDEX);

consensus/types/src/test_utils/macros.rs

@@ -27,25 +27,6 @@ macro_rules! ssz_tests {
     };
 }
 
-#[macro_export]
-macro_rules! ssz_tests_by_fork {
-    ($type: ty, $fork:expr) => {
-        #[test]
-        pub fn test_ssz_round_trip() {
-            use ssz::ssz_encode;
-            use $crate::test_utils::{SeedableRng, TestRandom, XorShiftRng};
-
-            let mut rng = XorShiftRng::from_seed([42; 16]);
-            let original = <$type>::random_for_test(&mut rng);
-
-            let bytes = ssz_encode(&original);
-            let decoded = <$type>::from_ssz_bytes(&bytes, $fork).unwrap();
-
-            assert_eq!(original, decoded);
-        }
-    };
-}
-
 #[macro_export]
 macro_rules! tree_hash_tests {
     ($type: ty) => {

consensus/types/src/test_utils/test_random.rs

@@ -12,7 +12,6 @@ mod bitfield;
 mod hash256;
 mod kzg_commitment;
 mod kzg_proof;
-mod light_client_header;
 mod public_key;
 mod public_key_bytes;
 mod secret_key;