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

Remove unused var from block_producer

Browse Source 
It was made redundant when `proposer_slots` was removed.
This commit is contained in:
Paul Hauner 2019-02-13 07:39:00 +11:00
parent 5c1d0dcea5
commit 05ed778ccc
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs
View File

@ -70,7 +70,6 @@ impl ValidatorHarness {
let block_producer = BlockProducer::new( let block_producer = BlockProducer::new(
spec.clone(), spec.clone(),
keypair.pk.clone(),
epoch_map.clone(), epoch_map.clone(),
slot_clock.clone(), slot_clock.clone(),
beacon_node.clone(), beacon_node.clone(),

7
eth2/block_producer/src/lib.rs
View File

@ -4,7 +4,7 @@ mod traits;
use slot_clock::SlotClock; use slot_clock::SlotClock;
use ssz::ssz_encode; use ssz::ssz_encode;
use std::sync::Arc; use std::sync::Arc;
use types::{BeaconBlock, ChainSpec, PublicKey, Slot}; use types::{BeaconBlock, ChainSpec, Slot};
pub use self::traits::{ pub use self::traits::{
BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer, BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer,
@ -48,7 +48,6 @@ pub enum Error {
/// Relies upon an external service to keep the `EpochDutiesMap` updated. /// Relies upon an external service to keep the `EpochDutiesMap` updated.
pub struct BlockProducer<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> { pub struct BlockProducer<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> {
pub last_processed_slot: Option<Slot>, pub last_processed_slot: Option<Slot>,
pubkey: PublicKey,
spec: Arc<ChainSpec>, spec: Arc<ChainSpec>,
epoch_map: Arc<V>, epoch_map: Arc<V>,
slot_clock: Arc<T>, slot_clock: Arc<T>,
@ -60,7 +59,6 @@ impl<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> BlockProducer<T, U
/// Returns a new instance where `last_processed_slot == 0`. /// Returns a new instance where `last_processed_slot == 0`.
pub fn new( pub fn new(
spec: Arc<ChainSpec>, spec: Arc<ChainSpec>,
pubkey: PublicKey,
epoch_map: Arc<V>, epoch_map: Arc<V>,
slot_clock: Arc<T>, slot_clock: Arc<T>,
beacon_node: Arc<U>, beacon_node: Arc<U>,
@ -68,7 +66,6 @@ impl<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> BlockProducer<T, U
) -> Self { ) -> Self {
Self { Self {
last_processed_slot: None, last_processed_slot: None,
pubkey,
spec, spec,
epoch_map, epoch_map,
slot_clock, slot_clock,
@ -238,11 +235,9 @@ mod tests {
let produce_epoch = produce_slot.epoch(spec.epoch_length); let produce_epoch = produce_slot.epoch(spec.epoch_length);
epoch_map.map.insert(produce_epoch, produce_slot); epoch_map.map.insert(produce_epoch, produce_slot);
let epoch_map = Arc::new(epoch_map); let epoch_map = Arc::new(epoch_map);
let keypair = Keypair::random();
let mut block_producer = BlockProducer::new( let mut block_producer = BlockProducer::new(
spec.clone(), spec.clone(),
keypair.pk.clone(),
epoch_map.clone(), epoch_map.clone(),
slot_clock.clone(), slot_clock.clone(),
beacon_node.clone(), beacon_node.clone(),

3
validator_client/src/main.rs
View File

@ -142,7 +142,6 @@ fn main() {
// Spawn a new thread to perform block production for the validator. // Spawn a new thread to perform block production for the validator.
let producer_thread = { let producer_thread = {
let spec = spec.clone(); let spec = spec.clone();
let pubkey = keypair.pk.clone();
let signer = Arc::new(LocalSigner::new(keypair.clone())); let signer = Arc::new(LocalSigner::new(keypair.clone()));
let duties_map = duties_map.clone(); let duties_map = duties_map.clone();
let slot_clock = slot_clock.clone(); let slot_clock = slot_clock.clone();
@ -150,7 +149,7 @@ fn main() {
let client = Arc::new(BeaconBlockGrpcClient::new(beacon_block_grpc_client.clone())); let client = Arc::new(BeaconBlockGrpcClient::new(beacon_block_grpc_client.clone()));
thread::spawn(move || { thread::spawn(move || {
let block_producer = let block_producer =
BlockProducer::new(spec, pubkey, duties_map, slot_clock, client, signer); BlockProducer::new(spec, duties_map, slot_clock, client, signer);
let mut block_producer_service = BlockProducerService { let mut block_producer_service = BlockProducerService {
block_producer, block_producer,
poll_interval_millis, poll_interval_millis,