gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 08:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SlotClock error from block production, tidy.

Browse Source
This commit is contained in:
Paul Hauner
2019-02-01 16:21:18 +11:00
parent 9d1f98ba8f
commit db230475d7
4 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/beacon_chain/test_harness/src/validator/beacon_node/attester.rs
View File

@@ -1,14 +1,10 @@
use super::BenchingBeaconNode;
use attester::{BeaconNode as AttesterBeaconNode, BeaconNodeError as NodeError, PublishOutcome};
use beacon_chain::block_production::Error as BlockProductionError;
use db::ClientDB;
use slot_clock::SlotClock;
use types::{AttestationData, FreeAttestation};
impl<T: ClientDB, U: SlotClock> AttesterBeaconNode for BenchingBeaconNode<T, U>
where
BlockProductionError: From<<U>::Error>,
{
impl<T: ClientDB, U: SlotClock> AttesterBeaconNode for BenchingBeaconNode<T, U> {
fn produce_attestation_data(
&self,
_slot: u64,

6
beacon_node/beacon_chain/test_harness/src/validator/beacon_node/producer.rs
View File

@@ -1,5 +1,4 @@
use super::BenchingBeaconNode;
use beacon_chain::block_production::Error as BlockProductionError;
use block_producer::{
BeaconNode as BeaconBlockNode, BeaconNodeError as BeaconBlockNodeError, PublishOutcome,
};
@@ -7,10 +6,7 @@ use db::ClientDB;
use slot_clock::SlotClock;
use types::{BeaconBlock, PublicKey, Signature};
impl<T: ClientDB, U: SlotClock> BeaconBlockNode for BenchingBeaconNode<T, U>
where
BlockProductionError: From<<U>::Error>,
{
impl<T: ClientDB, U: SlotClock> BeaconBlockNode for BenchingBeaconNode<T, U> {
/// Requests the `proposer_nonce` from the `BeaconChain`.
fn proposer_nonce(&self, pubkey: &PublicKey) -> Result<u64, BeaconBlockNodeError> {
let validator_index = self

12
beacon_node/beacon_chain/test_harness/src/validator/direct_duties.rs
View File

@@ -1,7 +1,7 @@
use attester::{
DutiesReader as AttesterDutiesReader, DutiesReaderError as AttesterDutiesReaderError,
};
use beacon_chain::{block_production::Error as BlockProductionError, BeaconChain};
use beacon_chain::BeaconChain;
use block_producer::{
DutiesReader as ProducerDutiesReader, DutiesReaderError as ProducerDutiesReaderError,
};
@@ -24,10 +24,7 @@ impl<T: ClientDB, U: SlotClock> DirectDuties<T, U> {
}
}
impl<T: ClientDB, U: SlotClock> ProducerDutiesReader for DirectDuties<T, U>
where
BlockProductionError: From<<U>::Error>,
{
impl<T: ClientDB, U: SlotClock> ProducerDutiesReader for DirectDuties<T, U> {
fn is_block_production_slot(&self, slot: u64) -> Result<bool, ProducerDutiesReaderError> {
let validator_index = self
.beacon_chain
@@ -42,10 +39,7 @@ where
}
}
impl<T: ClientDB, U: SlotClock> AttesterDutiesReader for DirectDuties<T, U>
where
BlockProductionError: From<<U>::Error>,
{
impl<T: ClientDB, U: SlotClock> AttesterDutiesReader for DirectDuties<T, U> {
fn validator_index(&self) -> Option<u64> {
match self.beacon_chain.validator_index(&self.pubkey) {
Some(index) => Some(index as u64),