Ran cargo fmt.

This commit is contained in:
Luke Anderson
2019-03-28 21:01:47 +11:00
parent 867af4bc6a
commit 87acaac8a0
9 changed files with 38 additions and 51 deletions

View File

@@ -3,8 +3,10 @@ mod traits;
use ssz::TreeHash;
use std::sync::Arc;
use types::{AttestationData, AttestationDataAndCustodyBit, Attestation, Signature,
AggregateSignature, Slot, AttestationDuty, Bitfield};
use types::{
AggregateSignature, Attestation, AttestationData, AttestationDataAndCustodyBit,
AttestationDuty, Bitfield, Signature, Slot,
};
pub use self::traits::{
BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer,
@@ -59,20 +61,28 @@ impl<U: BeaconNode, W: Signer> Attester<U, W> {
}
impl<B: BeaconNode, W: Signer> Attester<B, W> {
fn produce_attestation(&mut self, attestation_duty: AttestationDuty) -> Result<PollOutcome, Error> {
let attestation_data = match self.beacon_node.produce_attestation_data(
attestation_duty.slot,
attestation_duty.shard
)? {
fn produce_attestation(
&mut self,
attestation_duty: AttestationDuty,
) -> Result<PollOutcome, Error> {
let attestation_data = match self
.beacon_node
.produce_attestation_data(attestation_duty.slot, attestation_duty.shard)?
{
Some(attestation_data) => attestation_data,
None => return Ok(PollOutcome::BeaconNodeUnableToProduceAttestation(attestation_duty.slot)),
None => {
return Ok(PollOutcome::BeaconNodeUnableToProduceAttestation(
attestation_duty.slot,
))
}
};
dbg!(&attestation_data);
if !self.safe_to_produce(&attestation_data) {
return Ok(PollOutcome::SlashableAttestationNotProduced(attestation_duty.slot));
return Ok(PollOutcome::SlashableAttestationNotProduced(
attestation_duty.slot,
));
}
let signature = match self.sign_attestation_data(&attestation_data) {
@@ -82,7 +92,6 @@ impl<B: BeaconNode, W: Signer> Attester<B, W> {
let mut agg_sig = AggregateSignature::new();
agg_sig.add(&signature);
let attestation = Attestation {
aggregation_bitfield: Bitfield::new(),
data: attestation_data,
@@ -172,10 +181,7 @@ mod tests {
let attest_epoch = attest_slot / spec.slots_per_epoch;
let attest_shard = 12;
let mut attester = Attester::new(
beacon_node.clone(),
signer.clone(),
);
let mut attester = Attester::new(beacon_node.clone(), signer.clone());
// Configure responses from the BeaconNode.
beacon_node.set_next_produce_result(Ok(Some(AttestationData::random_for_test(&mut rng))));
@@ -220,6 +226,5 @@ mod tests {
Ok(PollOutcome::ProducerDutiesUnknown(slot))
);
*/
}
}

View File

@@ -1,6 +1,6 @@
use crate::traits::{BeaconNode, BeaconNodeError, PublishOutcome};
use std::sync::RwLock;
use types::{AttestationData, Attestation, Slot};
use types::{Attestation, AttestationData, Slot};
type ProduceResult = Result<Option<AttestationData>, BeaconNodeError>;
type PublishResult = Result<PublishOutcome, BeaconNodeError>;

View File

@@ -1,4 +1,4 @@
use types::{AttestationData, Attestation, Signature, Slot};
use types::{Attestation, AttestationData, Signature, Slot};
#[derive(Debug, PartialEq, Clone)]
pub enum BeaconNodeError {