gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove double-locking in eth/v1/node/syncing (#6202)

Browse Source 
* Remove double-locking in `eth/v1/node/syncing`
This commit is contained in:
Michael Sproul
2024-08-06 12:32:58 +10:00
committed by GitHub
parent f7f0bfc9f2
commit f126a42b7e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_node/http_api/src/lib.rs
View File

@@ -2872,7 +2872,11 @@ pub fn serve<T: BeaconChainTypes>(
task_spawner task_spawner
.blocking_json_task(Priority::P0, move || { .blocking_json_task(Priority::P0, move || {
let head_slot = chain.canonical_head.cached_head().head_slot(); let (head, head_execution_status) = chain
.canonical_head
.head_and_execution_status()
.map_err(warp_utils::reject::beacon_chain_error)?;
let head_slot = head.head_slot();
let current_slot = let current_slot =
chain.slot_clock.now_or_genesis().ok_or_else(|| { chain.slot_clock.now_or_genesis().ok_or_else(|| {
warp_utils::reject::custom_server_error( warp_utils::reject::custom_server_error(
@@ -2883,9 +2887,7 @@ pub fn serve<T: BeaconChainTypes>(
// Taking advantage of saturating subtraction on slot. // Taking advantage of saturating subtraction on slot.
let sync_distance = current_slot - head_slot; let sync_distance = current_slot - head_slot;
let is_optimistic = chain let is_optimistic = head_execution_status.is_optimistic_or_invalid();
.is_optimistic_or_invalid_head()
.map_err(warp_utils::reject::beacon_chain_error)?;
let syncing_data = api_types::SyncingData { let syncing_data = api_types::SyncingData {
is_syncing: !network_globals.sync_state.read().is_synced(), is_syncing: !network_globals.sync_state.read().is_synced(),