From 896810fb9fed1ba891f62b5e9dc63d02c1a4ea67 Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Wed, 24 Oct 2018 10:13:47 +0200
Subject: [PATCH] Add `status` to validator induction.

Allows for inducting validators with a specific status.
---
 .../validator_induction/src/inductor.rs       | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/beacon_chain/validator_induction/src/inductor.rs b/beacon_chain/validator_induction/src/inductor.rs
index e025d0d43..c4344bf67 100644
--- a/beacon_chain/validator_induction/src/inductor.rs
+++ b/beacon_chain/validator_induction/src/inductor.rs
@@ -40,15 +40,15 @@ impl ValidatorInductor {
     ///
     /// Returns an error if the registration is invalid, otherwise returns the index of the
     /// validator in `CrystallizedState.validators`.
-    pub fn induct(&mut self, rego: &ValidatorRegistration)
+    pub fn induct(&mut self, rego: &ValidatorRegistration, status: ValidatorStatus)
         -> Result<usize, ValidatorInductionError>
     {
-        let v = self.process_registration(rego)?;
+        let v = self.process_registration(rego, status)?;
         Ok(self.add_validator(v))
     }
 
     /// Verify a `ValidatorRegistration` and return a `ValidatorRecord` if valid.
-    fn process_registration(&self, r: &ValidatorRegistration)
+    fn process_registration(&self, r: &ValidatorRegistration, status: ValidatorStatus)
         -> Result<ValidatorRecord, ValidatorInductionError>
     {
         /*
@@ -72,7 +72,7 @@ impl ValidatorInductor {
             randao_commitment: r.randao_commitment,
             randao_last_change: self.current_slot,
             balance: DEPOSIT_GWEI,
-            status: ValidatorStatus::PendingActivation as u8,
+            status: status as u8,
             exit_slot: 0,
         })
     }
@@ -166,7 +166,7 @@ mod tests {
         let r = get_registration();
 
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
 
         assert_eq!(result.unwrap(), 0);
@@ -174,6 +174,22 @@ mod tests {
         assert_eq!(validators.len(), 1);
     }
 
+    #[test]
+    fn test_validator_inductor_status() {
+        let validators = vec![];
+
+        let r = get_registration();
+
+        let mut inductor = ValidatorInductor::new(0, 1024, validators);
+        let _ = inductor.induct(&r, ValidatorStatus::PendingActivation);
+        let _ = inductor.induct(&r, ValidatorStatus::Active);
+        let validators = inductor.to_vec();
+
+        assert!(validators[0].status == ValidatorStatus::PendingActivation as u8);
+        assert!(validators[1].status == ValidatorStatus::Active as u8);
+        assert_eq!(validators.len(), 2);
+    }
+
     #[test]
     fn test_validator_inductor_valid_all_active_validators() {
         let mut validators = vec![];
@@ -186,7 +202,7 @@ mod tests {
         let r = get_registration();
 
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
 
         assert_eq!(result.unwrap(), 5);
@@ -209,7 +225,7 @@ mod tests {
         let r = get_registration();
 
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
 
         assert_eq!(result.unwrap(), 1);
@@ -231,7 +247,7 @@ mod tests {
          */
         let r = get_registration();
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
         assert_eq!(result.unwrap(), 0);
         assert!(registration_equals_record(&r, &validators[0]));
@@ -241,7 +257,7 @@ mod tests {
          */
         let r_two = get_registration();
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r_two);
+        let result = inductor.induct(&r_two, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
         assert_eq!(result.unwrap(), 1);
         assert!(registration_equals_record(&r_two, &validators[1]));
@@ -256,7 +272,7 @@ mod tests {
         r.withdrawal_shard = 1025;
 
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
 
         assert_eq!(result, Err(ValidatorInductionError::InvalidShard));
@@ -272,7 +288,7 @@ mod tests {
         r.proof_of_possession = get_proof_of_possession(&kp);
 
         let mut inductor = ValidatorInductor::new(0, 1024, validators);
-        let result = inductor.induct(&r);
+        let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
         let validators = inductor.to_vec();
 
         assert_eq!(result, Err(ValidatorInductionError::InvaidProofOfPossession));