General github tests adoption

.circleci/config.yml

@@ -18,7 +18,12 @@ jobs:
           keys:
             - v1-gradle-dir-{{ checksum "build.gradle" }}
             - v1-gradle-dir-
-
+      - run:
+          name: Install git-lfs for submodules with large files
+          command: |
+            sudo sh -c "echo 'deb http://ftp.debian.org/debian stretch-backports main' >> /etc/apt/sources.list"
+            curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+            sudo apt-get update && sudo apt-get install -y git-lfs
       - run:
           name: Downloading dependencies
           command: ./gradlew allDependencies

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "test/src/test/resources/eth2.0-tests"]
-	path = test/src/test/resources/eth2.0-tests
-	url = https://github.com/ethereum/eth2.0-tests.git
 [submodule "crypto/src/main/resources/bls-key-pairs"]
 	path = crypto/src/main/resources/bls-key-pairs
 	url = https://github.com/harmony-dev/bls-key-pairs
+[submodule "test/src/test/resources/eth2.0-spec-tests"]
+	path = test/src/test/resources/eth2.0-spec-tests
+	url = https://github.com/ethereum/eth2.0-spec-tests.git

consensus/src/main/java/org/ethereum/beacon/consensus/spec/EpochProcessing.java

@@ -293,8 +293,7 @@ def process_crosslinks(state: BeaconState) -> None:
                   state.current_crosslinks[shard] = winning_crosslink
    */
   default void process_crosslinks(MutableBeaconState state) {
-    state.getPreviousCrosslinks().clear();
-    state.getPreviousCrosslinks().addAll(state.getCurrentCrosslinks().listCopy());
+    state.getPreviousCrosslinks().replaceAll(state.getCurrentCrosslinks().listCopy());
 
     for (EpochNumber epoch : get_previous_epoch(state).iterateTo(get_current_epoch(state).increment())) {
       for (UInt64 offset : UInt64s.iterate(UInt64.ZERO, get_epoch_committee_count(state, epoch))) {
@@ -694,8 +693,7 @@ default void process_final_updates(MutableBeaconState state) {
     /* Rotate current/previous epoch attestations
       state.previous_epoch_attestations = state.current_epoch_attestations
       state.current_epoch_attestations = [] */
-    state.getPreviousEpochAttestations().clear();
-    state.getPreviousEpochAttestations().addAll(state.getCurrentEpochAttestations().listCopy());
+    state.getPreviousEpochAttestations().replaceAll(state.getCurrentEpochAttestations().listCopy());
     state.getCurrentEpochAttestations().clear();
   }
 }

consensus/src/main/java/org/ethereum/beacon/consensus/spec/HelperFunction.java

@@ -484,10 +484,15 @@ def compute_committee(indices: List[ValidatorIndex], seed: Bytes32, index: int,
   default List<ValidatorIndex> compute_committee(List<ValidatorIndex> indices, Bytes32 seed, UInt64 index, UInt64 count) {
     UInt64 start = index.times(indices.size()).dividedBy(count);
     UInt64 end = index.increment().times(indices.size()).dividedBy(count);
+
+    return compute_committee(indices, start, end, seed);
+  }
+
+  default List<ValidatorIndex> compute_committee(List<ValidatorIndex> validator_indices, UInt64 start, UInt64 end, Bytes32 seed) {
     List<ValidatorIndex> result = new ArrayList<>();
     for (UInt64 i = start; i.compareTo(end) < 0; i = i.increment()) {
-      UInt64 shuffled_index = get_shuffled_index(i, UInt64.valueOf(indices.size()), seed);
-      result.add(indices.get(shuffled_index.getIntValue()));
+      UInt64 shuffled_index = get_shuffled_index(i, UInt64.valueOf(validator_indices.size()), seed);
+      result.add(validator_indices.get(shuffled_index.getIntValue()));
     }
     return result;
   }
@@ -497,9 +502,15 @@ default List<ValidatorIndex> compute_committee(List<ValidatorIndex> indices, Byt
    * Based on {@link #get_permuted_list(List, Bytes32)}.
    */
   default List<ValidatorIndex> compute_committee2(List<ValidatorIndex> indices, Bytes32 seed, UInt64 index, UInt64 count) {
-    List<ValidatorIndex> shuffled_indices = get_permuted_list(indices, seed)
+    UInt64 start = index.times(indices.size()).dividedBy(count);
+    UInt64 end = index.increment().times(indices.size()).dividedBy(count);
+    return compute_committee2(indices, start, end, seed);
+  }
+
+  default List<ValidatorIndex> compute_committee2(List<ValidatorIndex> validator_indices, UInt64 start, UInt64 end, Bytes32 seed) {
+    List<ValidatorIndex> shuffled_indices = get_permuted_list(validator_indices, seed)
         .stream().map(ValidatorIndex::new).collect(toList());
-    return split(shuffled_indices, count.getIntValue()).get(index.getIntValue());
+    return shuffled_indices.subList(start.intValue(), end.intValue());
   }
 
   /*

consensus/src/main/java/org/ethereum/beacon/consensus/spec/SpecCommons.java

@@ -1,6 +1,5 @@
 package org.ethereum.beacon.consensus.spec;
 
-import java.util.function.Function;
 import org.ethereum.beacon.consensus.hasher.ObjectHasher;
 import org.ethereum.beacon.core.BeaconState;
 import org.ethereum.beacon.core.spec.SpecConstants;
@@ -9,6 +8,8 @@
 import tech.pegasys.artemis.ethereum.core.Hash32;
 import tech.pegasys.artemis.util.bytes.BytesValue;
 
+import java.util.function.Function;
+
 /**
  * A common part of the spec that is shared by all its components.
  */
@@ -42,5 +43,17 @@ default void checkShardRange(ShardNumber shard) {
     assertTrue(shard.less(getConstants().getShardCount()));
   }
 
-  class SpecAssertionFailed extends RuntimeException {}
+  class SpecAssertionFailed extends RuntimeException {
+    @Override
+    public String getMessage() {
+      return toString();
+    }
+
+    @Override
+    public String toString() {
+      return String.format(
+          "SpecAssertionFailed{%s}",
+          getStackTrace().length > 1 ? getStackTrace()[1].toString() : "");
+    }
+  }
 }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/AttestationVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -27,7 +28,7 @@ public VerificationResult verify(Attestation attestation, BeaconState state) {
     try {
       spec.verify_attestation(state, attestation);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/AttesterSlashingVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -27,7 +28,7 @@ public VerificationResult verify(AttesterSlashing attesterSlashing, BeaconState
     try {
       spec.verify_attester_slashing(state, attesterSlashing);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/DepositVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -30,7 +31,7 @@ public VerificationResult verify(Deposit deposit, BeaconState state) {
     try {
       spec.verify_deposit(state, deposit);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/ProposerSlashingVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -27,7 +28,7 @@ public VerificationResult verify(ProposerSlashing proposerSlashing, BeaconState
     try {
       spec.verify_proposer_slashing(state, proposerSlashing);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/TransferVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -26,7 +27,7 @@ public VerificationResult verify(Transfer transfer, BeaconState state) {
     try {
       spec.verify_transfer(state, transfer);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

consensus/src/main/java/org/ethereum/beacon/consensus/verifier/operation/VoluntaryExitVerifier.java

@@ -1,6 +1,7 @@
 package org.ethereum.beacon.consensus.verifier.operation;
 
 import org.ethereum.beacon.consensus.BeaconChainSpec;
+import org.ethereum.beacon.consensus.spec.SpecCommons;
 import org.ethereum.beacon.consensus.verifier.OperationVerifier;
 import org.ethereum.beacon.consensus.verifier.VerificationResult;
 import org.ethereum.beacon.core.BeaconState;
@@ -27,7 +28,7 @@ public VerificationResult verify(VoluntaryExit voluntaryExit, BeaconState state)
     try {
       spec.verify_voluntary_exit(state, voluntaryExit);
       return VerificationResult.PASSED;
-    } catch (Exception e) {
+    } catch (SpecCommons.SpecAssertionFailed e) {
       return VerificationResult.failedResult(e.getMessage());
     }
   }

start/config/src/main/java/org/ethereum/beacon/emulator/config/chainspec/SpecBuilder.java

@@ -253,7 +253,7 @@ public EpochNumber getMinValidatorWithdrawabilityDelay() {
 
       @Override
       public EpochNumber getGenesisEpoch() {
-        return initialValues.getGenesisEpoch();
+        return getGenesisSlot().dividedBy(getSlotsPerEpoch());
       }
 
       @Override

test/build.gradle

@@ -17,6 +17,7 @@ dependencies {
 
 task submodulesUpdate(type:Exec) {
   description 'Updates (and inits) git submodules'
+  commandLine 'git', 'lfs', 'install'
   commandLine 'git', 'submodule', 'update', '--init', '--recursive'
   group 'Build Setup'
 }