merge queue: embarking unstable (adfa512) and [#6129 + #6134] together

beacon_node/http_api/src/lib.rs

@@ -2888,7 +2888,7 @@ pub fn serve<T: BeaconChainTypes>(
                                 .map_err(warp_utils::reject::beacon_chain_error)?;
 
                             let syncing_data = api_types::SyncingData {
-                                is_syncing: network_globals.sync_state.read().is_syncing(),
+                                is_syncing: !network_globals.sync_state.read().is_synced(),
                                 is_optimistic: Some(is_optimistic),
                                 el_offline: Some(el_offline),
                                 head_slot,

beacon_node/http_api/tests/tests.rs

@@ -23,7 +23,7 @@ use http_api::{
     test_utils::{create_api_server, ApiServer},
     BlockId, StateId,
 };
-use lighthouse_network::{Enr, EnrExt, PeerId};
+use lighthouse_network::{types::SyncState, Enr, EnrExt, PeerId};
 use network::NetworkReceivers;
 use proto_array::ExecutionStatus;
 use sensitive_url::SensitiveUrl;
@@ -62,6 +62,7 @@ const SKIPPED_SLOTS: &[u64] = &[
 ];
 
 struct ApiTester {
+    ctx: Arc<http_api::Context<EphemeralHarnessType<E>>>,
     harness: Arc<BeaconChainHarness<EphemeralHarnessType<E>>>,
     chain: Arc<BeaconChain<EphemeralHarnessType<E>>>,
     client: BeaconNodeHttpClient,
@@ -253,7 +254,7 @@ impl ApiTester {
         let log = null_logger().unwrap();
 
         let ApiServer {
-            ctx: _,
+            ctx,
             server,
             listening_socket,
             network_rx,
@@ -284,6 +285,7 @@ impl ApiTester {
         );
 
         Self {
+            ctx,
             harness: Arc::new(harness),
             chain,
             client,
@@ -350,7 +352,7 @@ impl ApiTester {
         let log = null_logger().unwrap();
 
         let ApiServer {
-            ctx: _,
+            ctx,
             server,
             listening_socket,
             network_rx,
@@ -371,6 +373,7 @@ impl ApiTester {
         );
 
         Self {
+            ctx,
             harness,
             chain,
             client,
@@ -2168,6 +2171,37 @@ impl ApiTester {
         self
     }
 
+    pub async fn test_get_node_syncing_stalled(self) -> Self {
+        // Set sync status to stalled.
+        *self
+            .ctx
+            .network_globals
+            .as_ref()
+            .unwrap()
+            .sync_state
+            .write() = SyncState::Stalled;
+
+        let is_syncing = self
+            .client
+            .get_node_syncing()
+            .await
+            .unwrap()
+            .data
+            .is_syncing;
+        assert_eq!(is_syncing, true);
+
+        // Reset sync state.
+        *self
+            .ctx
+            .network_globals
+            .as_ref()
+            .unwrap()
+            .sync_state
+            .write() = SyncState::Synced;
+
+        self
+    }
+
     pub async fn test_get_node_identity(self) -> Self {
         let result = self.client.get_node_identity().await.unwrap().data;
 
@@ -6123,6 +6157,8 @@ async fn node_get() {
         .await
         .test_get_node_syncing()
         .await
+        .test_get_node_syncing_stalled()
+        .await
         .test_get_node_identity()
         .await
         .test_get_node_health()

testing/simulator/src/basic_sim.rs

@@ -37,6 +37,8 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
         .unwrap_or(&String::from("0"))
         .parse::<usize>()
         .unwrap_or(0);
+    // extra beacon node added with delay
+    let extra_nodes: usize = 1;
     println!("PROPOSER-NODES: {}", proposer_nodes);
     let validators_per_node = matches
         .get_one::<String>("validators-per-node")
@@ -133,6 +135,7 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
                 LocalNetworkParams {
                     validator_count: total_validator_count,
                     node_count,
+                    extra_nodes,
                     proposer_nodes,
                     genesis_delay,
                 },

testing/simulator/src/fallback_sim.rs

@@ -143,6 +143,7 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> {
                 LocalNetworkParams {
                     validator_count: total_validator_count,
                     node_count,
+                    extra_nodes: 0,
                     proposer_nodes: 0,
                     genesis_delay,
                 },

testing/simulator/src/local_network.rs

@@ -27,6 +27,7 @@ pub struct LocalNetworkParams {
     pub validator_count: usize,
     pub node_count: usize,
     pub proposer_nodes: usize,
+    pub extra_nodes: usize,
     pub genesis_delay: u64,
 }
 
@@ -38,7 +39,7 @@ fn default_client_config(network_params: LocalNetworkParams, genesis_time: u64)
         genesis_time,
     };
     beacon_config.network.target_peers =
-        network_params.node_count + network_params.proposer_nodes - 1;
+        network_params.node_count + network_params.proposer_nodes + network_params.extra_nodes - 1;
     beacon_config.network.enr_address = (Some(Ipv4Addr::LOCALHOST), None);
     beacon_config.network.enable_light_client_server = true;
     beacon_config.network.discv5_config.enable_packet_filter = false;