Merge branch 'v0.9' into api-testing

tests/ef_tests/Makefile

@@ -1,5 +1,5 @@
 # Bump the test tag here and in .gitlab-ci.yml and CI will take care of updating the cached tarballs
-TESTS_TAG := v0.8.3
+TESTS_TAG := v0.9.1
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 

tests/ef_tests/src/cases/epoch_processing.rs

@@ -6,8 +6,8 @@ use crate::type_name;
 use crate::type_name::TypeName;
 use serde_derive::Deserialize;
 use state_processing::per_epoch_processing::{
-    errors::EpochProcessingError, process_crosslinks, process_final_updates,
-    process_justification_and_finalization, process_registry_updates, process_slashings,
+    errors::EpochProcessingError, process_final_updates, process_justification_and_finalization,
+    process_registry_updates, process_rewards_and_penalties, process_slashings,
     validator_statuses::ValidatorStatuses,
 };
 use std::marker::PhantomData;
@@ -38,7 +38,7 @@ pub trait EpochTransition<E: EthSpec>: TypeName + Debug + Sync {
 #[derive(Debug)]
 pub struct JustificationAndFinalization;
 #[derive(Debug)]
-pub struct Crosslinks;
+pub struct RewardsAndPenalties;
 #[derive(Debug)]
 pub struct RegistryUpdates;
 #[derive(Debug)]
@@ -50,7 +50,7 @@ type_name!(
     JustificationAndFinalization,
     "justification_and_finalization"
 );
-type_name!(Crosslinks, "crosslinks");
+type_name!(RewardsAndPenalties, "rewards_and_penalties");
 type_name!(RegistryUpdates, "registry_updates");
 type_name!(Slashings, "slashings");
 type_name!(FinalUpdates, "final_updates");
@@ -63,10 +63,11 @@ impl<E: EthSpec> EpochTransition<E> for JustificationAndFinalization {
     }
 }
 
-impl<E: EthSpec> EpochTransition<E> for Crosslinks {
+impl<E: EthSpec> EpochTransition<E> for RewardsAndPenalties {
     fn run(state: &mut BeaconState<E>, spec: &ChainSpec) -> Result<(), EpochProcessingError> {
-        process_crosslinks(state, spec)?;
-        Ok(())
+        let mut validator_statuses = ValidatorStatuses::new(state, spec)?;
+        validator_statuses.process_attestations(state, spec)?;
+        process_rewards_and_penalties(state, &mut validator_statuses, spec)
     }
 }
 

tests/ef_tests/src/cases/operations.rs

@@ -8,13 +8,13 @@ use ssz::Decode;
 use state_processing::per_block_processing::{
     errors::BlockProcessingError, process_attestations, process_attester_slashings,
     process_block_header, process_deposits, process_exits, process_proposer_slashings,
-    process_transfers, VerifySignatures,
+    VerifySignatures,
 };
 use std::fmt::Debug;
 use std::path::Path;
 use types::{
     Attestation, AttesterSlashing, BeaconBlock, BeaconState, ChainSpec, Deposit, EthSpec,
-    ProposerSlashing, Transfer, VoluntaryExit,
+    ProposerSlashing, VoluntaryExit,
 };
 
 #[derive(Debug, Clone, Default, Deserialize)]
@@ -95,16 +95,6 @@ impl<E: EthSpec> Operation<E> for ProposerSlashing {
     }
 }
 
-impl<E: EthSpec> Operation<E> for Transfer {
-    fn apply_to(
-        &self,
-        state: &mut BeaconState<E>,
-        spec: &ChainSpec,
-    ) -> Result<(), BlockProcessingError> {
-        process_transfers(state, &[self.clone()], VerifySignatures::True, spec)
-    }
-}
-
 impl<E: EthSpec> Operation<E> for VoluntaryExit {
     fn handler_name() -> String {
         "voluntary_exit".into()

tests/ef_tests/src/lib.rs

@@ -3,7 +3,7 @@ use types::EthSpec;
 pub use case_result::CaseResult;
 pub use cases::Case;
 pub use cases::{
-    Crosslinks, FinalUpdates, JustificationAndFinalization, RegistryUpdates, Slashings,
+    FinalUpdates, JustificationAndFinalization, RegistryUpdates, RewardsAndPenalties, Slashings,
 };
 pub use error::Error;
 pub use handler::*;

tests/ef_tests/src/type_name.rs

@@ -38,15 +38,12 @@ type_name!(MainnetEthSpec, "mainnet");
 
 type_name_generic!(Attestation);
 type_name!(AttestationData);
-type_name!(AttestationDataAndCustodyBit);
 type_name_generic!(AttesterSlashing);
 type_name_generic!(BeaconBlock);
 type_name_generic!(BeaconBlockBody);
 type_name!(BeaconBlockHeader);
 type_name_generic!(BeaconState);
 type_name!(Checkpoint);
-type_name_generic!(CompactCommittee);
-type_name!(Crosslink);
 type_name!(Deposit);
 type_name!(DepositData);
 type_name!(Eth1Data);
@@ -55,6 +52,5 @@ type_name_generic!(HistoricalBatch);
 type_name_generic!(IndexedAttestation);
 type_name_generic!(PendingAttestation);
 type_name!(ProposerSlashing);
-type_name!(Transfer);
 type_name!(Validator);
 type_name!(VoluntaryExit);

tests/ef_tests/tests/tests.rs

@@ -15,12 +15,6 @@ fn operations_deposit() {
     OperationsHandler::<MainnetEthSpec, Deposit>::run();
 }
 
-#[test]
-fn operations_transfer() {
-    OperationsHandler::<MinimalEthSpec, Transfer>::run();
-    // Note: there are no transfer tests for mainnet
-}
-
 #[test]
 fn operations_exit() {
     OperationsHandler::<MinimalEthSpec, VoluntaryExit>::run();
@@ -139,10 +133,6 @@ mod ssz_static {
 
     ssz_static_test!(attestation, Attestation<_>, SR);
     ssz_static_test!(attestation_data, AttestationData);
-    ssz_static_test!(
-        attestation_data_and_custody_bit,
-        AttestationDataAndCustodyBit
-    );
     ssz_static_test!(attester_slashing, AttesterSlashing<_>);
     ssz_static_test!(beacon_block, BeaconBlock<_>, SR);
     ssz_static_test!(beacon_block_body, BeaconBlockBody<_>);
@@ -155,8 +145,6 @@ mod ssz_static {
         }
     );
     ssz_static_test!(checkpoint, Checkpoint);
-    ssz_static_test!(compact_committee, CompactCommittee<_>);
-    ssz_static_test!(crosslink, Crosslink);
     ssz_static_test!(deposit, Deposit);
     ssz_static_test!(deposit_data, DepositData, SR);
     ssz_static_test!(eth1_data, Eth1Data);
@@ -165,7 +153,6 @@ mod ssz_static {
     ssz_static_test!(indexed_attestation, IndexedAttestation<_>, SR);
     ssz_static_test!(pending_attestation, PendingAttestation<_>);
     ssz_static_test!(proposer_slashing, ProposerSlashing);
-    ssz_static_test!(transfer, Transfer, SR);
     ssz_static_test!(validator, Validator);
     ssz_static_test!(voluntary_exit, VoluntaryExit, SR);
 }
@@ -187,9 +174,9 @@ fn epoch_processing_justification_and_finalization() {
 }
 
 #[test]
-fn epoch_processing_crosslinks() {
-    EpochProcessingHandler::<MinimalEthSpec, Crosslinks>::run();
-    EpochProcessingHandler::<MainnetEthSpec, Crosslinks>::run();
+fn epoch_processing_rewards_and_penalties() {
+    EpochProcessingHandler::<MinimalEthSpec, RewardsAndPenalties>::run();
+    // Note: there are no reward and penalty tests for mainnet yet
 }
 
 #[test]