gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-16 20:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

one test passing

Browse Source
This commit is contained in:
Grant Wuerker
2018-12-16 17:00:53 -06:00
parent a05364cb49
commit eef3627c92
4 changed files with 301 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
beacon_chain/validator_induction/src/inductor.rs
View File

@@ -1,5 +1,5 @@
use bls::verify_proof_of_possession;
use types::{ValidatorRecord, Deposit, ValidatorStatus, BeaconState};
use types::{ValidatorRecord, DepositInput, ValidatorStatus, BeaconState};
/// The size of a validators deposit in GWei.
pub const DEPOSIT_GWEI: u64 = 32_000_000_000;
@@ -34,20 +34,19 @@ impl ValidatorInductor {
/// validator in `CrystallizedState.validators`.
pub fn induct(
&mut self,
deposit: &Deposit,
deposit_input: &DepositInput,
status: ValidatorStatus,
) -> Result<usize, ValidatorInductionError> {
let v = self.process_registration(deposit, status)?;
let v = self.process_deposit(deposit_input, status)?;
Ok(self.add_validator(v))
}
/// Verify a `ValidatorRegistration` and return a `ValidatorRecord` if valid.
fn process_deposit(
&self,
deposit: &Deposit,
deposit_input: &DepositInput,
status: ValidatorStatus,
) -> Result<ValidatorRecord, ValidatorInductionError> {
let deposit_input = &deposit.deposit_data.deposit_input;
/*
* Ensure withdrawal shard is not too high.
*/
@@ -80,9 +79,8 @@ impl ValidatorInductor {
/// Returns the index of the first `ValidatorRecord` in the `CrystallizedState` where
/// `validator.status == Withdrawn`. If no such record exists, `None` is returned.
fn first_withdrawn_validator(&mut self) -> Option<usize> {
let validators = self.beacon_state.validator_registry;
for i in self.empty_validator_start..validators.len() {
if validators[i].status == ValidatorStatus::Withdrawn {
for i in self.empty_validator_start..self.beacon_state.validator_registry.len() {
if self.beacon_state.validator_registry[i].status == ValidatorStatus::Withdrawn {
self.empty_validator_start = i + 1;
return Some(i);
}
@@ -117,7 +115,7 @@ mod tests {
use bls::{Keypair, Signature};
use hashing::proof_of_possession_hash;
use types::{Address, Hash256};
use types::{Hash256};
/*
fn registration_equals_record(reg: &ValidatorRegistration, rec: &ValidatorRecord) -> bool {
@@ -135,26 +133,25 @@ mod tests {
Signature::new_hashed(&pop_message, &kp.sk)
}
/// Generate a basic working ValidatorRegistration for use in tests.
fn get_registration() -> ValidatorRegistration {
/// Generate a basic working Deposit for use in tests.
fn get_deposit_input() -> DepositInput {
let kp = Keypair::random();
ValidatorRegistration {
DepositInput {
pubkey: kp.pk.clone(),
withdrawal_shard: 0,
withdrawal_address: Address::zero(),
withdrawal_credentials: Hash256::zero(),
randao_commitment: Hash256::zero(),
proof_of_possession: get_proof_of_possession(&kp),
proof_of_possession: get_proof_of_possession(&kp)
}
}
#[test]
fn test_validator_inductor_valid_empty_validators() {
let validators = vec![];
let state = BeaconState::default();
let r = get_registration();
let d = get_deposit_input();
let mut inductor = ValidatorInductor::new(0, 1024, validators);
let result = inductor.induct(&r, ValidatorStatus::PendingActivation);
let mut inductor = ValidatorInductor::new(0, 1024, state);
let result = inductor.induct(&d, ValidatorStatus::PendingActivation);
let validators = inductor.to_vec();
assert_eq!(result.unwrap(), 0);
@@ -162,6 +159,7 @@ mod tests {
assert_eq!(validators.len(), 1);
}
/*
#[test]
fn test_validator_inductor_status() {
let validators = vec![];
@@ -285,4 +283,5 @@ mod tests {
);
assert_eq!(validators.len(), 0);
}
*/
}