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

Move attestation validation into iter.for_each

Browse Source
This commit is contained in:
Paul Hauner 2018-09-26 23:28:47 +10:00
parent a8b08fb300
commit debc642b50
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lighthouse/state/block/validation/validate_ssz_block.rs
View File

@ -1,4 +1,7 @@
use std::sync::Arc;
use std::sync::{
Arc,
RwLock,
};
use super::attestation_record::{
validate_attestation,
AttestationValidationError,
@ -170,22 +173,44 @@ pub fn validate_ssz_block<T>(b: &SszBlock,
*
* TODO: make this parallelized.
*/
for attestation in other_attestations {
let (a, _) = AttestationRecord::ssz_decode(&attestation, 0)?;
let attestation_voters = validate_attestation(
&a,
block_slot,
cycle_length,
last_justified_slot,
&parent_hashes,
&block_store,
&validator_store,
&attester_map)?;
if attestation_voters.is_none() {
return Err(SszBlockValidationError::
AttestationSignatureFailed);
}
}
let failure: Option<SszBlockValidationError> = None;
let failure = RwLock::new(failure);
other_attestations.iter()
.for_each(|attestation| {
if let Some(_) = *failure.read().unwrap() {
()
};
match AttestationRecord::ssz_decode(&attestation, 0) {
Ok((a, _)) => {
let result = validate_attestation(
&a,
block_slot,
cycle_length,
last_justified_slot,
&parent_hashes,
&block_store,
&validator_store,
&attester_map);
match result {
Err(e) => {
let mut failure = failure.write().unwrap();
*failure = Some(SszBlockValidationError::from(e));
}
Ok(None) => {
let mut failure = failure.write().unwrap();
*failure = Some(SszBlockValidationError::AttestationSignatureFailed);
}
_ => ()
}
}
Err(e) => {
let mut failure = failure.write().unwrap();
*failure = Some(SszBlockValidationError::from(e));
}
};
});
// TODO: handle validation failure. Presently, it will just pass everything
/*
* If we have reached this point, the block is a new valid block that is worthy of