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

Update components to suit v0.6.1 API

Browse Source
This commit is contained in:
Paul Hauner 2019-06-04 09:37:40 +10:00
parent 39cb63e01e
commit 82202a7765
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -726,7 +726,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
let mut state = self.state.read().clone(); let mut state = self.state.read().clone();
state.build_epoch_cache(RelativeEpoch::Current, &T::EthSpec::spec())?; state.build_committee_cache(RelativeEpoch::Current, &T::EthSpec::spec())?;
trace!("Finding attestations for new block..."); trace!("Finding attestations for new block...");
@ -742,7 +742,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
slot: state.slot, slot: state.slot,
previous_block_root, previous_block_root,
state_root: Hash256::zero(), // Updated after the state is calculated. state_root: Hash256::zero(), // Updated after the state is calculated.
signature: T::EthSpec::spec().empty_signature.clone(), // To be completed by a validator. signature: Signature::empty_signature(), // To be completed by a validator.
body: BeaconBlockBody { body: BeaconBlockBody {
randao_reveal, randao_reveal,
eth1_data: Eth1Data { eth1_data: Eth1Data {

14
beacon_node/http_server/src/metrics/local_metrics.rs
View File

@ -1,8 +1,8 @@
use beacon_chain::{BeaconChain, BeaconChainTypes}; use beacon_chain::{BeaconChain, BeaconChainTypes};
use prometheus::{IntGauge, Opts, Registry}; use prometheus::{IntGauge, Opts, Registry};
use slot_clock::SlotClock; use slot_clock::SlotClock;
use std::path::PathBuf;
use std::fs::File; use std::fs::File;
use std::path::PathBuf;
use types::Slot; use types::Slot;
// If set to `true` will iterate and sum the balances of all validators in the state for each // If set to `true` will iterate and sum the balances of all validators in the state for each
@ -79,11 +79,15 @@ impl LocalMetrics {
self.present_slot.set(present_slot.as_u64() as i64); self.present_slot.set(present_slot.as_u64() as i64);
self.best_slot.set(state.slot.as_u64() as i64); self.best_slot.set(state.slot.as_u64() as i64);
self.validator_count.set(state.validator_registry.len() as i64); self.validator_count
self.justified_epoch.set(state.current_justified_epoch.as_u64() as i64); .set(state.validator_registry.len() as i64);
self.finalized_epoch.set(state.finalized_epoch.as_u64() as i64); self.justified_epoch
.set(state.current_justified_epoch.as_u64() as i64);
self.finalized_epoch
.set(state.finalized_epoch.as_u64() as i64);
if SHOULD_SUM_VALIDATOR_BALANCES { if SHOULD_SUM_VALIDATOR_BALANCES {
self.validator_balances_sum.set(state.validator_balances.iter().sum::<u64>() as i64); self.validator_balances_sum
.set(state.balances.iter().sum::<u64>() as i64);
} }
let db_size = File::open(db_path) let db_size = File::open(db_path)
.and_then(|f| f.metadata()) .and_then(|f| f.metadata())