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

Remove backwards compatibility for el_offline and is_optimstic (#6168)

Browse Source 
* Remove Option around is_optimistic and el_offline
This commit is contained in:
Mac L
2024-07-25 04:10:46 +04:00
committed by GitHub
parent b4a7560c0e
commit a3f44c674b
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2889,8 +2889,8 @@ pub fn serve<T: BeaconChainTypes>(
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(),
is_optimistic: Some(is_optimistic), is_optimistic,
el_offline: Some(el_offline), el_offline,
head_slot, head_slot,
sync_distance, sync_distance,
}; };

20
beacon_node/http_api/tests/status_tests.rs
View File

@@ -56,8 +56,8 @@ async fn el_syncing_then_synced() {
mock_el.el.upcheck().await; mock_el.el.upcheck().await;
let api_response = tester.client.get_node_syncing().await.unwrap().data; let api_response = tester.client.get_node_syncing().await.unwrap().data;
assert_eq!(api_response.el_offline, Some(false)); assert_eq!(api_response.el_offline, false);
assert_eq!(api_response.is_optimistic, Some(false)); assert_eq!(api_response.is_optimistic, false);
assert_eq!(api_response.is_syncing, false); assert_eq!(api_response.is_syncing, false);
// EL synced // EL synced
@@ -65,8 +65,8 @@ async fn el_syncing_then_synced() {
mock_el.el.upcheck().await; mock_el.el.upcheck().await;
let api_response = tester.client.get_node_syncing().await.unwrap().data; let api_response = tester.client.get_node_syncing().await.unwrap().data;
assert_eq!(api_response.el_offline, Some(false)); assert_eq!(api_response.el_offline, false);
assert_eq!(api_response.is_optimistic, Some(false)); assert_eq!(api_response.is_optimistic, false);
assert_eq!(api_response.is_syncing, false); assert_eq!(api_response.is_syncing, false);
} }
@@ -84,8 +84,8 @@ async fn el_offline() {
mock_el.el.upcheck().await; mock_el.el.upcheck().await;
let api_response = tester.client.get_node_syncing().await.unwrap().data; let api_response = tester.client.get_node_syncing().await.unwrap().data;
assert_eq!(api_response.el_offline, Some(true)); assert_eq!(api_response.el_offline, true);
assert_eq!(api_response.is_optimistic, Some(false)); assert_eq!(api_response.is_optimistic, false);
assert_eq!(api_response.is_syncing, false); assert_eq!(api_response.is_syncing, false);
} }
@@ -127,8 +127,8 @@ async fn el_error_on_new_payload() {
// The EL should now be *offline* according to the API. // The EL should now be *offline* according to the API.
let api_response = tester.client.get_node_syncing().await.unwrap().data; let api_response = tester.client.get_node_syncing().await.unwrap().data;
assert_eq!(api_response.el_offline, Some(true)); assert_eq!(api_response.el_offline, true);
assert_eq!(api_response.is_optimistic, Some(false)); assert_eq!(api_response.is_optimistic, false);
assert_eq!(api_response.is_syncing, false); assert_eq!(api_response.is_syncing, false);
// Processing a block successfully should remove the status. // Processing a block successfully should remove the status.
@@ -143,8 +143,8 @@ async fn el_error_on_new_payload() {
harness.process_block_result((block, blobs)).await.unwrap(); harness.process_block_result((block, blobs)).await.unwrap();
let api_response = tester.client.get_node_syncing().await.unwrap().data; let api_response = tester.client.get_node_syncing().await.unwrap().data;
assert_eq!(api_response.el_offline, Some(false)); assert_eq!(api_response.el_offline, false);
assert_eq!(api_response.is_optimistic, Some(false)); assert_eq!(api_response.is_optimistic, false);
assert_eq!(api_response.is_syncing, false); assert_eq!(api_response.is_syncing, false);
} }

4
beacon_node/http_api/tests/tests.rs
View File

@@ -2159,9 +2159,9 @@ impl ApiTester {
let expected = SyncingData { let expected = SyncingData {
is_syncing: false, is_syncing: false,
is_optimistic: Some(false), is_optimistic: false,
// these tests run without the Bellatrix fork enabled // these tests run without the Bellatrix fork enabled
el_offline: Some(true), el_offline: true,
head_slot, head_slot,
sync_distance, sync_distance,
}; };

4
common/eth2/src/types.rs
View File

@@ -599,8 +599,8 @@ pub struct VersionData {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct SyncingData { pub struct SyncingData {
pub is_syncing: bool, pub is_syncing: bool,
pub is_optimistic: Option<bool>, pub is_optimistic: bool,
pub el_offline: Option<bool>, pub el_offline: bool,
pub head_slot: Slot, pub head_slot: Slot,
pub sync_distance: Slot, pub sync_distance: Slot,
} }

6
validator_client/src/check_synced.rs
View File

@@ -36,10 +36,8 @@ pub async fn check_synced<T: SlotClock>(
} }
}; };
// Default EL status to "online" for backwards-compatibility with BNs that don't include it.
let el_offline = resp.data.el_offline.unwrap_or(false);
let bn_is_synced = !resp.data.is_syncing || (resp.data.sync_distance.as_u64() < SYNC_TOLERANCE); let bn_is_synced = !resp.data.is_syncing || (resp.data.sync_distance.as_u64() < SYNC_TOLERANCE);
let is_synced = bn_is_synced && !el_offline; let is_synced = bn_is_synced && !resp.data.el_offline;
if let Some(log) = log_opt { if let Some(log) = log_opt {
if !is_synced { if !is_synced {
@@ -55,7 +53,7 @@ pub async fn check_synced<T: SlotClock>(
"sync_distance" => resp.data.sync_distance.as_u64(), "sync_distance" => resp.data.sync_distance.as_u64(),
"head_slot" => resp.data.head_slot.as_u64(), "head_slot" => resp.data.head_slot.as_u64(),
"endpoint" => %beacon_node, "endpoint" => %beacon_node,
"el_offline" => el_offline, "el_offline" => resp.data.el_offline,
); );
} }