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

Merging master, fixing conflicts.

Browse Source
This commit is contained in:
Luke Anderson 2019-03-28 23:57:06 +11:00
commit 367fbbc1c5
No known key found for this signature in database
GPG Key ID: 44408169EC61E228
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
validator_client/src/duties/mod.rs
View File

@ -51,7 +51,11 @@ impl<U: BeaconNode> DutiesManager<U> {
/// ///
/// be a wall-clock (e.g., system time, remote server time, etc.). /// be a wall-clock (e.g., system time, remote server time, etc.).
fn update(&self, epoch: Epoch) -> Result<UpdateOutcome, Error> { fn update(&self, epoch: Epoch) -> Result<UpdateOutcome, Error> {
<<<<<<< HEAD
let duties = self.beacon_node.request_duties(epoch, &self.signers)?; let duties = self.beacon_node.request_duties(epoch, &self.signers)?;
=======
let duties = self.beacon_node.request_duties(epoch, &self.pubkeys)?;
>>>>>>> master
{ {
// If these duties were known, check to see if they're updates or identical. // If these duties were known, check to see if they're updates or identical.
if let Some(known_duties) = self.duties_map.read()?.get(&epoch) { if let Some(known_duties) = self.duties_map.read()?.get(&epoch) {

31
validator_client/src/service.rs
View File

@ -205,7 +205,6 @@ impl Service {
None => panic!("No key pairs found, cannot start validator client without. Try running ./account_manager generate first.") None => panic!("No key pairs found, cannot start validator client without. Try running ./account_manager generate first.")
}; };
*/ */
let keypairs = Arc::new(generate_deterministic_keypairs(8)); let keypairs = Arc::new(generate_deterministic_keypairs(8));
/* build requisite objects to pass to core thread */ /* build requisite objects to pass to core thread */
@ -294,36 +293,6 @@ impl Service {
/* /*
for keypair in keypairs {
info!(self.log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id());
// Spawn a new thread to maintain the validator's `EpochDuties`.
let duties_manager_thread = {
let spec = spec.clone();
let duties_map = duties_map.clone();
let slot_clock = self.slot_clock.clone();
let log = self.log.clone();
let beacon_node = self.validator_client.clone();
let pubkey = keypair.pk.clone();
thread::spawn(move || {
let manager = DutiesManager {
duties_map,
pubkey,
spec,
slot_clock,
beacon_node,
};
let mut duties_manager_service = DutiesManagerService {
manager,
poll_interval_millis,
log,
};
duties_manager_service.run();
})
};
let mut threads = vec![];
for keypair in keypairs { for keypair in keypairs {
info!(log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id()); info!(log, "Starting validator services"; "validator" => keypair.pk.concatenated_hex_id());