cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

removed ValidatorRecord::zero_with_rand_keypair()

Browse Source
This commit is contained in:
Grant Wuerker 2019-01-07 21:49:57 -06:00
parent a3ef9231a6
commit d2a62fa211
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
beacon_chain/types/src/validator_record.rs
View File

@ -43,23 +43,6 @@ pub struct ValidatorRecord {
pub second_last_poc_slot: u64 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 { impl ValidatorRecord {
pub fn status_is(&self, status: ValidatorStatus) -> bool { pub fn status_is(&self, status: ValidatorStatus) -> bool {
self.status == status self.status == status

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

@ -98,6 +98,11 @@ mod tests {
deposit 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 { fn deposit_equals_record(dep: &Deposit, val: &ValidatorRecord) -> bool {
(dep.deposit_data.deposit_input.pubkey == val.pubkey) (dep.deposit_data.deposit_input.pubkey == val.pubkey)
& (dep.deposit_data.deposit_input.withdrawal_credentials == val.withdrawal_credentials) & (dep.deposit_data.deposit_input.withdrawal_credentials == val.withdrawal_credentials)
@ -142,7 +147,8 @@ mod tests {
let spec = ChainSpec::foundation(); let spec = ChainSpec::foundation();
let mut deposit = get_deposit(); let mut deposit = get_deposit();
let mut validator = ValidatorRecord::zero_with_rand_keypair(); let mut validator = get_validator();
deposit.deposit_data.value = DEPOSIT_GWEI; deposit.deposit_data.value = DEPOSIT_GWEI;
validator.pubkey = deposit.deposit_data.deposit_input.pubkey.clone(); validator.pubkey = deposit.deposit_data.deposit_input.pubkey.clone();
validator.withdrawal_credentials = deposit.deposit_data.deposit_input.withdrawal_credentials; validator.withdrawal_credentials = deposit.deposit_data.deposit_input.withdrawal_credentials;
@ -165,7 +171,8 @@ mod tests {
let mut state = BeaconState::default(); let mut state = BeaconState::default();
let spec = ChainSpec::foundation(); 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_registry.push(validator);
state.validator_balances.push(0); state.validator_balances.push(0);