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

Replaced unnecessary match statements with map_err and ok_or

Browse Source
This commit is contained in:
Luke Anderson 2019-09-04 11:18:29 +10:00
parent dcd074877b
commit b432c8c58c
No known key found for this signature in database
GPG Key ID: 44408169EC61E228
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
beacon_node/rest_api/src/validator.rs
View File

@ -53,15 +53,11 @@ pub fn get_validator_duties<T: BeaconChainTypes + 'static>(req: Request<Body>) -
e e
)) ))
})?; })?;
let validators: Vec<PublicKey> = match query.all_of("validator_pubkeys") { let validators: Vec<PublicKey> = query
Ok(v) => v .all_of("validator_pubkeys")?
.iter() .iter()
.map(|pk| parse_pubkey(pk)) .map(|pk| parse_pubkey(pk))
.collect::<Result<Vec<_>, _>>()?, .collect::<Result<Vec<_>, _>>()?;
Err(e) => {
return Err(e);
}
};
let mut duties: Vec<ValidatorDuty> = Vec::new(); let mut duties: Vec<ValidatorDuty> = Vec::new();
// Get a list of all validators for this epoch // Get a list of all validators for this epoch
@ -167,15 +163,14 @@ pub fn get_new_beacon_block<T: BeaconChainTypes + 'static>(req: Request<Body>) -
} }
}; };
let new_block = match beacon_chain.produce_block(randao_reveal, slot) { let (new_block, _state) = beacon_chain
Ok((block, _state)) => block, .produce_block(randao_reveal, slot)
Err(e) => { .map_err(|e| {
return Err(ApiError::ServerError(format!( ApiError::ServerError(format!(
"Beacon node is not able to produce a block: {:?}", "Beacon node is not able to produce a block: {:?}",
e e
))); ))
} })?;
};
let body = Body::from( let body = Body::from(
serde_json::to_string(&new_block) serde_json::to_string(&new_block)
@ -229,14 +224,9 @@ pub fn get_new_attestation<T: BeaconChainTypes + 'static>(req: Request<Body>) ->
}; };
// Check that we are requesting an attestation during the slot where it is relevant. // Check that we are requesting an attestation during the slot where it is relevant.
let present_slot = match beacon_chain.read_slot_clock() { let present_slot = beacon_chain.read_slot_clock().ok_or(ApiError::ServerError(
Some(s) => s,
None => {
return Err(ApiError::ServerError(
"Beacon node is unable to determine present slot, either the state isn't generated or the chain hasn't begun.".into() "Beacon node is unable to determine present slot, either the state isn't generated or the chain hasn't begun.".into()
)); ))?;
}
};
if val_duty.slot != present_slot { if val_duty.slot != present_slot {
return Err(ApiError::InvalidQueryParams(format!("Validator is only able to request an attestation during the slot they are allocated. Current slot: {:?}, allocated slot: {:?}", head_state.slot, val_duty.slot))); return Err(ApiError::InvalidQueryParams(format!("Validator is only able to request an attestation during the slot they are allocated. Current slot: {:?}, allocated slot: {:?}", head_state.slot, val_duty.slot)));
} }
@ -296,15 +286,9 @@ pub fn get_new_attestation<T: BeaconChainTypes + 'static>(req: Request<Body>) ->
return Err(e); return Err(e);
} }
}; };
let attestation_data = match beacon_chain.produce_attestation_data(shard) { let attestation_data = beacon_chain
Ok(v) => v, .produce_attestation_data(shard)
Err(e) => { .map_err(|e| ApiError::ServerError(format!("Could not produce an attestation: {:?}", e)))?;
return Err(ApiError::ServerError(format!(
"Could not produce an attestation: {:?}",
e
)));
}
};
let attestation: Attestation<T::EthSpec> = Attestation { let attestation: Attestation<T::EthSpec> = Attestation {
aggregation_bits, aggregation_bits,