Misc fixes.

- log cleanup
- move http_api config mutation to `config::get_config` for consistency
- fix light client API responses

Author: jimmygchen

beacon_node/beacon_chain/src/events.rs

@@ -117,21 +117,11 @@ impl<T: EthSpec> ServerSentEventHandler<T> {
             EventKind::LightClientFinalityUpdate(_) => self
                 .light_client_finality_update_tx
                 .send(kind)
-                .map(|count| {
-                    log_count(
-                        "Registering server-sent light client finality update event",
-                        count,
-                    )
-                }),
+                .map(|count| log_count("light client finality update", count)),
             EventKind::LightClientOptimisticUpdate(_) => self
                 .light_client_optimistic_update_tx
                 .send(kind)
-                .map(|count| {
-                    log_count(
-                        "Registering server-sent light client optimistic update event",
-                        count,
-                    )
-                }),
+                .map(|count| log_count("light client optimistic update", count)),
             EventKind::BlockReward(_) => self
                 .block_reward_tx
                 .send(kind)

beacon_node/client/src/builder.rs

@@ -165,7 +165,6 @@ where
         } else {
             None
         };
-        self.http_api_config.enable_light_client_server = config.network.enable_light_client_server;
 
         let execution_layer = if let Some(config) = config.execution_layer.clone() {
             let context = runtime_context.service_context("exec".into());

beacon_node/http_api/src/lib.rs

@@ -2397,15 +2397,15 @@ pub fn serve<T: BeaconChainTypes>(
         );
 
     /*
-     * beacon/rewards
+     * beacon/light_client
      */
 
     let beacon_light_client_path = eth_v1
         .and(warp::path("beacon"))
         .and(warp::path("light_client"))
         .and(chain_filter.clone());
 
-    // GET beacon/light_client/bootrap/{block_root}
+    // GET beacon/light_client/bootstrap/{block_root}
     let get_beacon_light_client_bootstrap = beacon_light_client_path
         .clone()
         .and(task_spawner_filter.clone())
@@ -2496,8 +2496,11 @@ pub fn serve<T: BeaconChainTypes>(
                                     e
                                 ))
                             }),
-                        _ => Ok(warp::reply::json(&api_types::GenericResponse::from(update))
-                            .into_response()),
+                        _ => Ok(warp::reply::json(&ForkVersionedResponse {
+                            version: Some(fork_name),
+                            data: update,
+                        })
+                        .into_response()),
                     }
                     .map(|resp| add_consensus_version_header(resp, fork_name))
                 })
@@ -2540,8 +2543,11 @@ pub fn serve<T: BeaconChainTypes>(
                                     e
                                 ))
                             }),
-                        _ => Ok(warp::reply::json(&api_types::GenericResponse::from(update))
-                            .into_response()),
+                        _ => Ok(warp::reply::json(&ForkVersionedResponse {
+                            version: Some(fork_name),
+                            data: update,
+                        })
+                        .into_response()),
                     }
                     .map(|resp| add_consensus_version_header(resp, fork_name))
                 })

beacon_node/src/config.rs

@@ -151,6 +151,9 @@ pub fn get_config<E: EthSpec>(
 
         client_config.http_api.duplicate_block_status_code =
             parse_required(cli_args, "http-duplicate-block-status")?;
+
+        client_config.http_api.enable_light_client_server =
+            cli_args.is_present("light-client-server");
     }
 
     if let Some(cache_size) = clap_utils::parse_optional(cli_args, "shuffling-cache-size")? {

lighthouse/tests/beacon_node.rs

@@ -2346,15 +2346,21 @@ fn sync_eth1_chain_disable_deposit_contract_sync_flag() {
 fn light_client_server_default() {
     CommandLineTest::new()
         .run_with_zero_port()
-        .with_config(|config| assert_eq!(config.network.enable_light_client_server, false));
+        .with_config(|config| {
+            assert_eq!(config.network.enable_light_client_server, false);
+            assert_eq!(config.http_api.enable_light_client_server, false);
+        });
 }
 
 #[test]
 fn light_client_server_enabled() {
     CommandLineTest::new()
         .flag("light-client-server", None)
         .run_with_zero_port()
-        .with_config(|config| assert_eq!(config.network.enable_light_client_server, true));
+        .with_config(|config| {
+            assert_eq!(config.network.enable_light_client_server, true);
+            assert_eq!(config.http_api.enable_light_client_server, true);
+        });
 }
 
 #[test]