[Merged by Bors] - Altair consensus changes and refactors

.github/workflows/test-suite.yml

@@ -26,8 +26,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Get latest version of stable Rust
-      run: rustup update stable
     - name: Get latest version of stable Rust
       run: rustup update stable
     - name: Check formatting with cargo fmt
@@ -58,6 +56,18 @@ jobs:
       run: choco install -y make
     - name: Run tests in release
       run: make test-release
+  beacon-chain-tests:
+    name: beacon-chain-tests
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Get latest version of stable Rust
+      run: rustup update stable
+    - name: Run beacon_chain tests for base hard fork
+      run: make test-beacon-chain-base
+    - name: Run beacon_chain tests for Altair hard fork
+      run: make test-beacon-chain-altair
   debug-tests-ubuntu:
     name: debug-tests-ubuntu
     runs-on: ubuntu-latest

Makefile

@@ -1,6 +1,7 @@
 .PHONY: tests
 
 EF_TESTS = "testing/ef_tests"
+BEACON_CHAIN_CRATE = "beacon_node/beacon_chain"
 STATE_TRANSITION_VECTORS = "testing/state_transition_vectors"
 GIT_TAG := $(shell git describe --tags --candidates 1)
 BIN_DIR = "bin"
@@ -79,30 +80,38 @@ build-release-tarballs:
 # Runs the full workspace tests in **release**, without downloading any additional
 # test vectors.
 test-release:
-	cargo test --all --release --exclude ef_tests
+	cargo test --workspace --release --exclude ef_tests --exclude beacon_chain
 
 # Runs the full workspace tests in **debug**, without downloading any additional test
 # vectors.
 test-debug:
-	cargo test --all --exclude ef_tests
+	cargo test --workspace --exclude ef_tests --exclude beacon_chain
 
 # Runs cargo-fmt (linter).
 cargo-fmt:
 	cargo fmt --all -- --check
 
 # Typechecks benchmark code
 check-benches:
-	cargo check --all --benches
+	cargo check --workspace --benches
 
 # Typechecks consensus code *without* allowing deprecated legacy arithmetic
 check-consensus:
 	cargo check --manifest-path=consensus/state_processing/Cargo.toml --no-default-features
 
 # Runs only the ef-test vectors.
 run-ef-tests:
+	rm -rf $(EF_TESTS)/.accessed_file_log.txt
 	cargo test --release --manifest-path=$(EF_TESTS)/Cargo.toml --features "ef_tests"
 	cargo test --release --manifest-path=$(EF_TESTS)/Cargo.toml --features "ef_tests,fake_crypto"
 	cargo test --release --manifest-path=$(EF_TESTS)/Cargo.toml --features "ef_tests,milagro"
+	./$(EF_TESTS)/check_all_files_accessed.py $(EF_TESTS)/.accessed_file_log.txt $(EF_TESTS)/eth2.0-spec-tests
+
+# Run the tests in the `beacon_chain` crate.
+test-beacon-chain: test-beacon-chain-base test-beacon-chain-altair
+
+test-beacon-chain-%:
+	env FORK_NAME=$* cargo test --release --features fork_from_env --manifest-path=$(BEACON_CHAIN_CRATE)/Cargo.toml
 
 # Runs only the tests/state_transition_vectors tests.
 run-state-transition-tests:
@@ -121,7 +130,7 @@ test-full: cargo-fmt test-release test-debug test-ef
 # Lints the code for bad style and potentially unsafe arithmetic using Clippy.
 # Clippy lints are opt-in per-crate for now. By default, everything is allowed except for performance and correctness lints.
 lint:
-	cargo clippy --all --tests -- \
+	cargo clippy --workspace --tests -- \
         -D warnings \
         -A clippy::from-over-into \
         -A clippy::upper-case-acronyms \

account_manager/src/validator/exit.rs

@@ -116,7 +116,7 @@ async fn publish_voluntary_exit<E: EthSpec>(
         .beacon_state::<E>()
         .as_ref()
         .expect("network should have valid genesis state")
-        .genesis_validators_root;
+        .genesis_validators_root();
 
     // Verify that the beacon node and validator being exited are on the same network.
     if genesis_data.genesis_validators_root != testnet_genesis_root {

account_manager/src/validator/slashing_protection.rs

@@ -77,7 +77,7 @@ pub fn cli_run<T: EthSpec>(
 
     let genesis_validators_root = testnet_config
         .beacon_state::<T>()
-        .map(|state: BeaconState<T>| state.genesis_validators_root)
+        .map(|state: BeaconState<T>| state.genesis_validators_root())
         .map_err(|e| {
             format!(
                 "Unable to get genesis state, has genesis occurred? Detail: {:?}",

beacon_node/beacon_chain/Cargo.toml

@@ -9,9 +9,9 @@ default = ["participation_metrics"]
 write_ssz_files = []  # Writes debugging .ssz files to /tmp during block processing.
 participation_metrics = []  # Exposes validator participation metrics to Prometheus.
 test_logger = [] # Print log output to stderr when running tests instead of dropping it
+fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable
 
 [dev-dependencies]
-int_to_bytes = { path = "../../consensus/int_to_bytes" }
 maplit = "1.0.2"
 environment = { path = "../../lighthouse/environment" }
 
@@ -45,6 +45,7 @@ eth1 = { path = "../eth1" }
 futures = "0.3.7"
 genesis = { path = "../genesis" }
 integer-sqrt = "0.1.5"
+int_to_bytes = { path = "../../consensus/int_to_bytes" }
 rand = "0.7.3"
 rand_core = "0.6.2"
 proto_array = { path = "../../consensus/proto_array" }
@@ -56,7 +57,7 @@ safe_arith = { path = "../../consensus/safe_arith" }
 fork_choice = { path = "../../consensus/fork_choice" }
 task_executor = { path = "../../common/task_executor" }
 derivative = "2.1.1"
-itertools = "0.9.0"
+itertools = "0.10.0"
 regex = "1.3.9"
 exit-future = "0.2.0"
 slasher = { path = "../../slasher" }

beacon_node/beacon_chain/src/attestation_verification.rs

@@ -895,7 +895,7 @@ pub fn verify_attestation_signature<T: BeaconChainTypes>(
         .canonical_head
         .try_read_for(HEAD_LOCK_TIMEOUT)
         .ok_or(BeaconChainError::CanonicalHeadLockTimeout)
-        .map(|head| head.beacon_state.fork)?;
+        .map(|head| head.beacon_state.fork())?;
 
     let signature_set = indexed_attestation_signature_set_from_pubkeys(
         |validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
@@ -1001,7 +1001,7 @@ pub fn verify_signed_aggregate_signatures<T: BeaconChainTypes>(
         .canonical_head
         .try_read_for(HEAD_LOCK_TIMEOUT)
         .ok_or(BeaconChainError::CanonicalHeadLockTimeout)
-        .map(|head| head.beacon_state.fork)?;
+        .map(|head| head.beacon_state.fork())?;
 
     let signature_sets = vec![
         signed_aggregate_selection_proof_signature_set(