gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-06 18:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into spec-v0.12

Browse Source
This commit is contained in:
Paul Hauner
2020-06-21 10:33:02 +10:00
parent 305724770d 710409c2ba
commit decea48c78
60 changed files with 1812 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/rest_api/Cargo.toml
View File

@@ -10,7 +10,7 @@ bls = { path = "../../crypto/bls" }
rest_types = { path = "../../common/rest_types" }
beacon_chain = { path = "../beacon_chain" }
network = { path = "../network" }
eth2-libp2p = { path = "../eth2-libp2p" }
eth2_libp2p = { path = "../eth2_libp2p" }
store = { path = "../store" }
version = { path = "../version" }
serde = { version = "1.0.110", features = ["derive"] }

1
beacon_node/rest_api/src/metrics.rs
View File

@@ -104,6 +104,7 @@ pub fn get_prometheus<T: BeaconChainTypes>(
slot_clock::scrape_for_metrics::<T::EthSpec, T::SlotClock>(&beacon_chain.slot_clock);
store::scrape_for_metrics(&db_path, &freezer_db_path);
beacon_chain::scrape_for_metrics(&beacon_chain);
eth2_libp2p::scrape_discovery_metrics();
// This will silently fail if we are unable to observe the health. This is desired behaviour
// since we don't support `Health` for all platforms.