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

Clean up representation of ValidatorStatus

Browse Source
This commit is contained in:
Alex Stokes 2018-12-12 19:05:32 -08:00
parent fa3d9bdb07
commit 1ff47720f1
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,14 +2,14 @@ use super::bls::{Keypair, PublicKey};
use super::{Address, Hash256};
use std::convert;
#[derive(Debug, PartialEq, Clone, Copy)]
#[derive(Debug, PartialEq, Clone)]
pub enum ValidatorStatus {
PendingActivation = 0,
Active = 1,
PendingExit = 2,
PendingWithdraw = 3,
Withdrawn = 5,
Penalized = 127,
PendingActivation,
Active,
PendingExit,
PendingWithdraw,
Withdrawn,
Penalized,
}
impl convert::From<u8> for ValidatorStatus {
@ -59,7 +59,7 @@ impl ValidatorRecord {
}
pub fn status_is(&self, status: ValidatorStatus) -> bool {
self.status == status as u8
self.status == status
}
}

4
beacon_chain/validator_change/src/lib.rs
View File

@ -62,7 +62,7 @@ pub fn update_validator_set(
/*
* Validator is pending activiation.
*/
x if x == ValidatorStatus::PendingActivation => {
ValidatorStatus::PendingActivation => {
let new_total_changed = total_changed
.checked_add(deposit_size_gwei)
.ok_or(UpdateValidatorSetError::ArithmeticOverflow)?;
@ -82,7 +82,7 @@ pub fn update_validator_set(
/*
* Validator is pending exit.
*/
x if x == ValidatorStatus::PendingExit => {
ValidatorStatus::PendingExit => {
let new_total_changed = total_changed
.checked_add(v.balance)
.ok_or(UpdateValidatorSetError::ArithmeticOverflow)?;