Merge branch 'master' into validator-record-update

beacon_chain/types/src/lib.rs

@@ -13,7 +13,6 @@ pub mod beacon_block_body;
 pub mod beacon_state;
 pub mod candidate_pow_receipt_root_record;
 pub mod casper_slashing;
-pub mod chain_config;
 pub mod crosslink_record;
 pub mod crystallized_state;
 pub mod deposit;
@@ -40,7 +39,6 @@ pub use crate::beacon_block::BeaconBlock;
 pub use crate::beacon_block_body::BeaconBlockBody;
 pub use crate::beacon_state::BeaconState;
 pub use crate::casper_slashing::CasperSlashing;
-pub use crate::chain_config::ChainConfig;
 pub use crate::crosslink_record::CrosslinkRecord;
 pub use crate::crystallized_state::CrystallizedState;
 pub use crate::deposit::Deposit;

beacon_chain/utils/vec_shuffle/src/lib.rs

@@ -42,40 +42,40 @@ mod tests {
     extern crate yaml_rust;
 
     use self::yaml_rust::yaml;
-    use super::hashing::canonical_hash;
-    use super::*;
-    use std::fs::File;
-    use std::io::prelude::*;
 
-    // TODO: update test vectors to use keccak instead of blake.
+    use std::{fs::File, io::prelude::*, path::PathBuf};
-    // https://github.com/sigp/lighthouse/issues/121
+
+    use super::{hashing::canonical_hash, *};
+
     #[test]
-    #[should_panic]
     fn test_shuffling() {
-        let mut file = File::open("./src/specs/shuffle_test_vectors.yaml").unwrap();
+        let mut file = {
+            let mut file_path_buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+            file_path_buf.push("src/specs/shuffle_test_vectors.yaml");
+
+            File::open(file_path_buf).unwrap()
+        };
+
         let mut yaml_str = String::new();
 
         file.read_to_string(&mut yaml_str).unwrap();
 
         let docs = yaml::YamlLoader::load_from_str(&yaml_str).unwrap();
         let doc = &docs[0];
-        let test_cases = doc["test_cases"].as_vec();
+        let test_cases = doc["test_cases"].as_vec().unwrap();
 
-        for test_case in test_cases.unwrap() {
+        for test_case in test_cases {
             let input = test_case["input"].clone().into_vec().unwrap();
             let output = test_case["output"].clone().into_vec().unwrap();
             let seed_bytes = test_case["seed"].as_str().unwrap().as_bytes();
-            let mut seed;
 
-            if seed_bytes.len() > 0 {
+            let seed = if seed_bytes.len() > 0 {
-                seed = canonical_hash(seed_bytes);
+                canonical_hash(seed_bytes)
             } else {
-                seed = vec![];
+                vec![]
-            }
+            };
 
-            let mut s = shuffle(&seed, input).unwrap();
+            assert_eq!(shuffle(&seed, input).unwrap(), output);
-
-            assert_eq!(s, output);
         }
     }
 }

beacon_chain/utils/vec_shuffle/src/specs/shuffle_test_vectors.yaml

@@ -1,5 +1,3 @@
-# This file was generated with sigp/shuffling_sandbox
-# python3 sandbox.py test_vectors
 title: Shuffling Algorithm Tests
 summary: Test vectors for shuffling a list based upon a seed.
 test_suite: Shuffling
@@ -15,13 +13,13 @@ test_cases:
   output: [255]
   seed: ''
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [1, 6, 4, 1, 6, 6, 2, 2, 4, 5]
+  output: [2, 1, 1, 5, 6, 6, 6, 2, 4, 4]
   seed: ''
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [4, 7, 10, 13, 3, 1, 2, 9, 12, 6, 11, 8, 5]
+  output: [4, 9, 6, 8, 13, 3, 2, 11, 5, 1, 12, 7, 10]
   seed: ''
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [1, 6, 65, 1, 6, 6, 2, 2, 4, 5]
+  output: [2, 1, 1, 5, 6, 6, 6, 2, 4, 65]
   seed: ''
 - input: []
   output: []
@@ -33,13 +31,13 @@ test_cases:
   output: [255]
   seed: 4kn4driuctg8
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 4, 2, 5, 4, 2, 6, 6, 1, 1]
+  output: [2, 4, 4, 2, 1, 1, 6, 5, 6, 6]
   seed: 4kn4driuctg8
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [13, 1, 9, 8, 3, 10, 6, 2, 5, 12, 11, 4, 7]
+  output: [7, 6, 3, 12, 11, 1, 8, 13, 10, 5, 9, 4, 2]
   seed: 4kn4driuctg8
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 65, 2, 5, 4, 2, 6, 6, 1, 1]
+  output: [2, 4, 65, 2, 1, 1, 6, 5, 6, 6]
   seed: 4kn4driuctg8
 - input: []
   output: []
@@ -51,13 +49,13 @@ test_cases:
   output: [255]
   seed: ytre1p
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 5, 1, 6, 4, 1, 2, 4, 6]
+  output: [6, 1, 1, 5, 6, 2, 6, 2, 4, 4]
   seed: ytre1p
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [3, 8, 10, 4, 7, 11, 6, 1, 2, 5, 13, 9, 12]
+  output: [6, 2, 3, 4, 8, 5, 12, 9, 7, 11, 10, 1, 13]
   seed: ytre1p
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 5, 1, 6, 4, 1, 2, 65, 6]
+  output: [6, 1, 1, 5, 6, 2, 6, 2, 4, 65]
   seed: ytre1p
 - input: []
   output: []
@@ -69,13 +67,13 @@ test_cases:
   output: [255]
   seed: mytobcffnkvj
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [5, 6, 2, 1, 6, 4, 6, 4, 1, 2]
+  output: [2, 4, 1, 1, 6, 4, 6, 5, 6, 2]
   seed: mytobcffnkvj
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [12, 4, 11, 6, 13, 10, 9, 2, 3, 7, 8, 1, 5]
+  output: [11, 5, 9, 7, 2, 4, 12, 10, 8, 1, 6, 3, 13]
   seed: mytobcffnkvj
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [5, 6, 2, 1, 6, 65, 6, 4, 1, 2]
+  output: [2, 65, 1, 1, 6, 4, 6, 5, 6, 2]
   seed: mytobcffnkvj
 - input: []
   output: []
@@ -87,13 +85,13 @@ test_cases:
   output: [255]
   seed: myzu3g7evxp5nkvj
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 6, 5, 4, 4, 1, 6, 2, 1]
+  output: [6, 2, 1, 4, 2, 6, 5, 6, 4, 1]
   seed: myzu3g7evxp5nkvj
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [10, 12, 13, 3, 7, 11, 2, 4, 9, 8, 6, 5, 1]
+  output: [2, 1, 11, 3, 9, 7, 8, 13, 4, 10, 5, 6, 12]
   seed: myzu3g7evxp5nkvj
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 6, 5, 65, 4, 1, 6, 2, 1]
+  output: [6, 2, 1, 4, 2, 6, 5, 6, 65, 1]
   seed: myzu3g7evxp5nkvj
 - input: []
   output: []
@@ -105,13 +103,13 @@ test_cases:
   output: [255]
   seed: xdpli1jsx5xb
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 4, 1, 2, 6, 5, 1, 6, 4]
+  output: [2, 1, 2, 4, 6, 6, 5, 6, 1, 4]
   seed: xdpli1jsx5xb
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [11, 8, 12, 9, 2, 1, 10, 4, 13, 5, 7, 3, 6]
+  output: [5, 8, 12, 9, 11, 4, 7, 13, 1, 3, 2, 10, 6]
   seed: xdpli1jsx5xb
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [6, 2, 65, 1, 2, 6, 5, 1, 6, 4]
+  output: [2, 1, 2, 65, 6, 6, 5, 6, 1, 4]
   seed: xdpli1jsx5xb
 - input: []
   output: []
@@ -123,11 +121,11 @@ test_cases:
   output: [255]
   seed: oab3mbb3xe8qsx5xb
 - input: [4, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [2, 5, 1, 6, 1, 2, 6, 6, 4, 4]
+  output: [6, 2, 1, 1, 6, 2, 4, 4, 6, 5]
   seed: oab3mbb3xe8qsx5xb
 - input: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-  output: [5, 13, 9, 7, 11, 10, 12, 2, 6, 8, 3, 1, 4]
+  output: [1, 8, 5, 13, 2, 10, 7, 11, 12, 6, 3, 4, 9]
   seed: oab3mbb3xe8qsx5xb
 - input: [65, 6, 2, 6, 1, 4, 6, 2, 1, 5]
-  output: [2, 5, 1, 6, 1, 2, 6, 6, 65, 4]
+  output: [6, 2, 1, 1, 6, 2, 4, 65, 6, 5]
   seed: oab3mbb3xe8qsx5xb