diff --git a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs index 04b29f8991..c84a993a52 100644 --- a/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs +++ b/beacon_node/beacon_chain/test_harness/src/validator_harness/mod.rs @@ -70,7 +70,6 @@ impl ValidatorHarness { let block_producer = BlockProducer::new( spec.clone(), - keypair.pk.clone(), epoch_map.clone(), slot_clock.clone(), beacon_node.clone(), diff --git a/eth2/block_producer/src/lib.rs b/eth2/block_producer/src/lib.rs index 20cd50d9c9..f6a0fd6dff 100644 --- a/eth2/block_producer/src/lib.rs +++ b/eth2/block_producer/src/lib.rs @@ -4,7 +4,7 @@ mod traits; use slot_clock::SlotClock; use ssz::ssz_encode; use std::sync::Arc; -use types::{BeaconBlock, ChainSpec, PublicKey, Slot}; +use types::{BeaconBlock, ChainSpec, Slot}; pub use self::traits::{ BeaconNode, BeaconNodeError, DutiesReader, DutiesReaderError, PublishOutcome, Signer, @@ -48,7 +48,6 @@ pub enum Error { /// Relies upon an external service to keep the `EpochDutiesMap` updated. pub struct BlockProducer { pub last_processed_slot: Option, - pubkey: PublicKey, spec: Arc, epoch_map: Arc, slot_clock: Arc, @@ -60,7 +59,6 @@ impl BlockProducer, - pubkey: PublicKey, epoch_map: Arc, slot_clock: Arc, beacon_node: Arc, @@ -68,7 +66,6 @@ impl BlockProducer Self { Self { last_processed_slot: None, - pubkey, spec, epoch_map, slot_clock, @@ -238,11 +235,9 @@ mod tests { let produce_epoch = produce_slot.epoch(spec.epoch_length); epoch_map.map.insert(produce_epoch, produce_slot); let epoch_map = Arc::new(epoch_map); - let keypair = Keypair::random(); let mut block_producer = BlockProducer::new( spec.clone(), - keypair.pk.clone(), epoch_map.clone(), slot_clock.clone(), beacon_node.clone(), diff --git a/validator_client/src/main.rs b/validator_client/src/main.rs index 8fa49e51c5..98be9159a8 100644 --- a/validator_client/src/main.rs +++ b/validator_client/src/main.rs @@ -142,7 +142,6 @@ fn main() { // Spawn a new thread to perform block production for the validator. let producer_thread = { let spec = spec.clone(); - let pubkey = keypair.pk.clone(); let signer = Arc::new(LocalSigner::new(keypair.clone())); let duties_map = duties_map.clone(); let slot_clock = slot_clock.clone(); @@ -150,7 +149,7 @@ fn main() { let client = Arc::new(BeaconBlockGrpcClient::new(beacon_block_grpc_client.clone())); thread::spawn(move || { 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 { block_producer, poll_interval_millis,