From 0e3d0848acd82450762c3ed5b599ef3cb2c7b96c Mon Sep 17 00:00:00 2001
From: Kirk Baird <baird.k@outlook.com>
Date: Thu, 17 Jan 2019 17:59:33 +1100
Subject: [PATCH] Relove formatting and other issues raise in PR

---
 beacon_chain/genesis/Cargo.toml          |  1 -
 beacon_chain/genesis/src/beacon_block.rs |  4 ----
 beacon_chain/genesis/src/beacon_state.rs | 26 ++++++++----------------
 beacon_chain/types/src/beacon_state.rs   |  2 +-
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/beacon_chain/genesis/Cargo.toml b/beacon_chain/genesis/Cargo.toml
index dbfd7e1fc..499333979 100644
--- a/beacon_chain/genesis/Cargo.toml
+++ b/beacon_chain/genesis/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2018"
 
 [dependencies]
 bls = { path = "../utils/bls"  }
-bls-aggregates = { git = "https://github.com/sigp/signature-schemes" }
 spec = { path = "../spec"  }
 ssz = { path = "../utils/ssz" }
 types = { path = "../types"  }
diff --git a/beacon_chain/genesis/src/beacon_block.rs b/beacon_chain/genesis/src/beacon_block.rs
index 6caa0c80c..92230cd98 100644
--- a/beacon_chain/genesis/src/beacon_block.rs
+++ b/beacon_chain/genesis/src/beacon_block.rs
@@ -53,7 +53,6 @@ mod tests {
     fn test_zero_items() {
         let spec = ChainSpec::foundation();
 
-        // Note: state_root will not be available without a state (test in beacon_state)
         let state_root = Hash256::zero();
 
         let genesis_block = genesis_beacon_block(state_root, &spec);
@@ -69,7 +68,6 @@ mod tests {
     fn test_beacon_body() {
         let spec = ChainSpec::foundation();
 
-        // Note: state_root will not be available without a state (test in beacon_state)
         let state_root = Hash256::zero();
 
         let genesis_block = genesis_beacon_block(state_root, &spec);
@@ -87,7 +85,6 @@ mod tests {
     fn test_signature() {
         let spec = ChainSpec::foundation();
 
-        // Note: state_root will not be available without a state (test in beacon_state)
         let state_root = Hash256::zero();
 
         let genesis_block = genesis_beacon_block(state_root, &spec);
@@ -97,7 +94,6 @@ mod tests {
         let raw_sig = genesis_block.signature.as_raw();
         let raw_sig_bytes = raw_sig.as_bytes();
 
-        assert!(raw_sig_bytes.len() == 97);
         for item in raw_sig_bytes.iter() {
             assert!(*item == 0);
         }
diff --git a/beacon_chain/genesis/src/beacon_state.rs b/beacon_chain/genesis/src/beacon_state.rs
index 7326bbf1d..58feca840 100644
--- a/beacon_chain/genesis/src/beacon_state.rs
+++ b/beacon_chain/genesis/src/beacon_state.rs
@@ -88,14 +88,11 @@ impl From<ValidatorAssignmentError> for Error {
 
 #[cfg(test)]
 mod tests {
-    extern crate bls;
-    extern crate validator_induction;
-
     use super::*;
     use types::Hash256;
 
     #[test]
-    fn test_gen_state() {
+    fn test_genesis_state() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -106,9 +103,8 @@ mod tests {
         );
     }
 
-    // Test Misc
     #[test]
-    fn test_gen_state_misc() {
+    fn test_genesis_state_misc() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -120,9 +116,8 @@ mod tests {
         assert_eq!(state.fork_data.fork_slot, 0);
     }
 
-    // Test validators
     #[test]
-    fn test_gen_state_validators() {
+    fn test_genesis_state_validators() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -134,9 +129,8 @@ mod tests {
         assert_eq!(state.validator_registry_delta_chain_tip, Hash256::zero());
     }
 
-    // Test randomness and committees
     #[test]
-    fn test_gen_state_randomness_committees() {
+    fn test_genesis_state_randomness_committees() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -161,13 +155,11 @@ mod tests {
     }
 
     // Custody not implemented until Phase 1
-    // This test will always pass until Phase 1
     #[test]
-    fn test_gen_state_custody() {}
+    fn test_genesis_state_custody() {}
 
-    // Test finality
     #[test]
-    fn test_gen_state_finanilty() {
+    fn test_genesis_state_finanilty() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -178,9 +170,8 @@ mod tests {
         assert_eq!(state.finalized_slot, 0);
     }
 
-    // Test recent state
     #[test]
-    fn test_gen_state_recent_state() {
+    fn test_genesis_state_recent_state() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
@@ -211,9 +202,8 @@ mod tests {
         assert!(state.batched_block_roots.is_empty());
     }
 
-    // Test PoW Receipts a.k.a. deposits
     #[test]
-    fn test_gen_state_deposit_root() {
+    fn test_genesis_state_deposit_root() {
         let spec = ChainSpec::foundation();
 
         let state = genesis_beacon_state(&spec).unwrap();
diff --git a/beacon_chain/types/src/beacon_state.rs b/beacon_chain/types/src/beacon_state.rs
index b9994bddd..cbcb00d19 100644
--- a/beacon_chain/types/src/beacon_state.rs
+++ b/beacon_chain/types/src/beacon_state.rs
@@ -10,7 +10,7 @@ use hashing::canonical_hash;
 use rand::RngCore;
 use ssz::{ssz_encode, Decodable, DecodeError, Encodable, SszStream};
 
-// Custody will not be added to the specs until Phase 1 (Sharding Phase) so dummay class used.
+// Custody will not be added to the specs until Phase 1 (Sharding Phase) so dummy class used.
 type CustodyChallenge = usize;
 
 #[derive(Debug, PartialEq, Clone, Default)]