From d2a62fa2110216e75b92437d39fa4309eafcfc74 Mon Sep 17 00:00:00 2001
From: Grant Wuerker <gwuerker@googlemail.com>
Date: Mon, 7 Jan 2019 21:49:57 -0600
Subject: [PATCH] removed ValidatorRecord::zero_with_rand_keypair()

---
 beacon_chain/types/src/validator_record.rs      | 17 -----------------
 .../validator_induction/src/inductor.rs         | 11 +++++++++--
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/beacon_chain/types/src/validator_record.rs b/beacon_chain/types/src/validator_record.rs
index 579509945c..c1eb9e6057 100644
--- a/beacon_chain/types/src/validator_record.rs
+++ b/beacon_chain/types/src/validator_record.rs
@@ -43,23 +43,6 @@ pub struct ValidatorRecord {
     pub second_last_poc_slot: u64
 }
 
-impl ValidatorRecord {
-    pub fn zero_with_rand_keypair() -> Self {    
-        Self {
-            pubkey: Keypair::random().pk,
-            withdrawal_credentials: Hash256::zero(),
-            randao_commitment: Hash256::zero(),
-            randao_layers: 0,
-            status: ValidatorStatus::from(0),
-            latest_status_change_slot: 0,
-            exit_count: 0,
-            poc_commitment: Hash256::zero(),
-            last_poc_change_slot: 0,
-            second_last_poc_slot: 0
-        }
-    }
-}
-
 impl ValidatorRecord {
     pub fn status_is(&self, status: ValidatorStatus) -> bool {
         self.status == status
diff --git a/beacon_chain/validator_induction/src/inductor.rs b/beacon_chain/validator_induction/src/inductor.rs
index 1599866667..856bb5e71d 100644
--- a/beacon_chain/validator_induction/src/inductor.rs
+++ b/beacon_chain/validator_induction/src/inductor.rs
@@ -98,6 +98,11 @@ mod tests {
         deposit
     }
     
+    fn get_validator() -> ValidatorRecord {    
+        let mut rng = XorShiftRng::from_seed([42; 16]);
+        ValidatorRecord::random_for_test(&mut rng)
+    }
+    
     fn deposit_equals_record(dep: &Deposit, val: &ValidatorRecord) -> bool {
         (dep.deposit_data.deposit_input.pubkey == val.pubkey)
             & (dep.deposit_data.deposit_input.withdrawal_credentials == val.withdrawal_credentials)
@@ -142,7 +147,8 @@ mod tests {
         let spec = ChainSpec::foundation();
         
         let mut deposit = get_deposit();
-        let mut validator = ValidatorRecord::zero_with_rand_keypair();
+        let mut validator = get_validator();
+        
         deposit.deposit_data.value = DEPOSIT_GWEI;
         validator.pubkey = deposit.deposit_data.deposit_input.pubkey.clone();
         validator.withdrawal_credentials = deposit.deposit_data.deposit_input.withdrawal_credentials;
@@ -165,7 +171,8 @@ mod tests {
         let mut state = BeaconState::default();
         let spec = ChainSpec::foundation();
             
-        let validator = ValidatorRecord::zero_with_rand_keypair();
+        let mut validator = get_validator();
+        validator.latest_status_change_slot = 0;
         state.validator_registry.push(validator);
         state.validator_balances.push(0);