BLS and SSZ static tests

tests/ef_tests/tests/tests.rs

@@ -1,12 +1,20 @@
 use ef_tests::*;
 use rayon::prelude::*;
 use std::path::{Path, PathBuf};
+use types::{
+    Attestation, AttestationData, AttestationDataAndCustodyBit, AttesterSlashing, BeaconBlock,
+    BeaconBlockBody, BeaconBlockHeader, BeaconState, Checkpoint, CompactCommittee, Crosslink,
+    Deposit, DepositData, Eth1Data, Fork, HistoricalBatch, IndexedAttestation, MainnetEthSpec,
+    MinimalEthSpec, PendingAttestation, ProposerSlashing, Transfer, Validator, VoluntaryExit,
+};
 use walkdir::WalkDir;
 
 fn yaml_files_in_test_dir(dir: &Path) -> Vec<PathBuf> {
     let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("eth2.0-spec-tests")
         .join("tests")
+        .join("general")
+        .join("phase0")
         .join(dir);
 
     assert!(
@@ -155,12 +163,107 @@ fn sanity_slots() {
 #[cfg(not(feature = "fake_crypto"))]
 fn bls() {
     yaml_files_in_test_dir(&Path::new("bls"))
-        .into_par_iter()
+        .into_iter()
         .for_each(|file| {
             Doc::assert_tests_pass(file);
         });
 }
 
+#[test]
+#[cfg(not(feature = "fake_crypto"))]
+fn bls_aggregate_pubkeys() {
+    BlsAggregatePubkeysHandler::run();
+}
+
+#[test]
+#[cfg(not(feature = "fake_crypto"))]
+fn bls_aggregate_sigs() {
+    BlsAggregateSigsHandler::run();
+}
+
+#[test]
+#[cfg(not(feature = "fake_crypto"))]
+fn bls_msg_hash_g2_compressed() {
+    BlsG2CompressedHandler::run();
+}
+
+#[test]
+#[cfg(not(feature = "fake_crypto"))]
+fn bls_priv_to_pub() {
+    BlsPrivToPubHandler::run();
+}
+
+#[test]
+#[cfg(not(feature = "fake_crypto"))]
+fn bls_sign_msg() {
+    BlsSignMsgHandler::run();
+}
+
+macro_rules! ssz_static_test {
+    // Signed-root
+    ($test_name:ident, $typ:ident$(<$generics:tt>)?, SR) => {
+        ssz_static_test!($test_name, SszStaticSRHandler, $typ$(<$generics>)?);
+    };
+    // Non-signed root
+    ($test_name:ident, $typ:ident$(<$generics:tt>)?) => {
+        ssz_static_test!($test_name, SszStaticHandler, $typ$(<$generics>)?);
+    };
+    // Generic
+    ($test_name:ident, $handler:ident, $typ:ident<_>) => {
+        ssz_static_test!(
+            $test_name, $handler, {
+                ($typ<MinimalEthSpec>, MinimalEthSpec),
+                ($typ<MainnetEthSpec>, MainnetEthSpec)
+            }
+        );
+    };
+    // Non-generic
+    ($test_name:ident, $handler:ident, $typ:ident) => {
+        ssz_static_test!(
+            $test_name, $handler, {
+                ($typ, MinimalEthSpec),
+                ($typ, MainnetEthSpec)
+            }
+        );
+    };
+    // Base case
+    ($test_name:ident, $handler:ident, { $(($typ:ty, $spec:ident)),+ }) => {
+        #[test]
+        #[cfg(feature = "fake_crypto")]
+        fn $test_name() {
+            $(
+                $handler::<$typ, $spec>::run();
+            )+
+        }
+    };
+}
+
+ssz_static_test!(ssz_static_attestation, Attestation<_>, SR);
+ssz_static_test!(ssz_static_attestation_data, AttestationData);
+ssz_static_test!(
+    ssz_static_attestation_data_and_custody_bit,
+    AttestationDataAndCustodyBit
+);
+ssz_static_test!(ssz_static_attester_slashing, AttesterSlashing<_>);
+ssz_static_test!(ssz_static_beacon_block, BeaconBlock<_>, SR);
+ssz_static_test!(ssz_static_beacon_block_body, BeaconBlockBody<_>);
+ssz_static_test!(ssz_static_beacon_block_header, BeaconBlockHeader, SR);
+ssz_static_test!(ssz_static_beacon_state, BeaconState<_>);
+ssz_static_test!(ssz_static_checkpoint, Checkpoint);
+ssz_static_test!(ssz_static_compact_committee, CompactCommittee<_>);
+ssz_static_test!(ssz_static_crosslink, Crosslink);
+ssz_static_test!(ssz_static_deposit, Deposit);
+ssz_static_test!(ssz_static_deposit_data, DepositData, SR);
+ssz_static_test!(ssz_static_eth1_data, Eth1Data);
+ssz_static_test!(ssz_static_fork, Fork);
+ssz_static_test!(ssz_static_historical_batch, HistoricalBatch<_>);
+ssz_static_test!(ssz_static_indexed_attestation, IndexedAttestation<_>, SR);
+ssz_static_test!(ssz_static_pending_attestation, PendingAttestation<_>);
+ssz_static_test!(ssz_static_proposer_slashing, ProposerSlashing);
+ssz_static_test!(ssz_static_transfer, Transfer, SR);
+ssz_static_test!(ssz_static_validator, Validator);
+ssz_static_test!(ssz_static_voluntary_exit, VoluntaryExit, SR);
+
 #[test]
 fn epoch_processing_justification_and_finalization() {
     yaml_files_in_test_dir(&Path::new("epoch_processing").join("justification_and_finalization"))