Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-focil-branch

beacon_node/client/src/builder.rs

@@ -168,7 +168,7 @@ where
         let store = store.ok_or("beacon_chain_start_method requires a store")?;
         let runtime_context =
             runtime_context.ok_or("beacon_chain_start_method requires a runtime context")?;
-        let context = runtime_context.service_context("beacon".into());
+        let context = runtime_context.clone();
         let spec = chain_spec.ok_or("beacon_chain_start_method requires a chain spec")?;
         let event_handler = if self.http_api_config.enabled {
             Some(ServerSentEventHandler::new(
@@ -179,7 +179,7 @@ where
         };
 
         let execution_layer = if let Some(config) = config.execution_layer.clone() {
-            let context = runtime_context.service_context("exec".into());
+            let context = runtime_context.clone();
             let execution_layer = ExecutionLayer::from_config(config, context.executor.clone())
                 .map_err(|e| format!("unable to start execution layer endpoints: {:?}", e))?;
             Some(execution_layer)
@@ -517,7 +517,7 @@ where
             .runtime_context
             .as_ref()
             .ok_or("node timer requires a runtime_context")?
-            .service_context("node_timer".into());
+            .clone();
         let beacon_chain = self
             .beacon_chain
             .clone()
@@ -557,7 +557,7 @@ where
             .runtime_context
             .as_ref()
             .ok_or("slasher requires a runtime_context")?
-            .service_context("slasher_service_ctxt".into());
+            .clone();
         SlasherService::new(beacon_chain, network_senders.network_send()).run(&context.executor)
     }
 
@@ -568,7 +568,7 @@ where
             .runtime_context
             .as_ref()
             .ok_or("monitoring_client requires a runtime_context")?
-            .service_context("monitoring_client".into());
+            .clone();
         let monitoring_client = MonitoringHttpClient::new(config)?;
         monitoring_client.auto_update(
             context.executor,
@@ -583,7 +583,7 @@ where
             .runtime_context
             .as_ref()
             .ok_or("slot_notifier requires a runtime_context")?
-            .service_context("slot_notifier".into());
+            .clone();
         let beacon_chain = self
             .beacon_chain
             .clone()
@@ -692,7 +692,7 @@ where
 
         if let Some(beacon_chain) = self.beacon_chain.as_ref() {
             if let Some(network_globals) = &self.network_globals {
-                let beacon_processor_context = runtime_context.service_context("bproc".into());
+                let beacon_processor_context = runtime_context.clone();
                 BeaconProcessor {
                     network_globals: network_globals.clone(),
                     executor: beacon_processor_context.executor.clone(),
@@ -715,7 +715,7 @@ where
                 )?;
             }
 
-            let state_advance_context = runtime_context.service_context("state_advance".into());
+            let state_advance_context = runtime_context.clone();
             spawn_state_advance_timer(state_advance_context.executor, beacon_chain.clone());
 
             if let Some(execution_layer) = beacon_chain.execution_layer.as_ref() {
@@ -767,8 +767,7 @@ where
             // Spawn service to publish light_client updates at some interval into the slot.
             if let Some(light_client_server_rv) = self.light_client_server_rv {
                 let inner_chain = beacon_chain.clone();
-                let light_client_update_context =
+                let light_client_update_context = runtime_context.clone();
-                    runtime_context.service_context("lc_update".to_string());
                 light_client_update_context.executor.spawn(
                     async move {
                         compute_light_client_updates(

beacon_node/lighthouse_network/tests/common.rs

@@ -120,7 +120,6 @@ pub async fn build_libp2p_instance(
     boot_nodes: Vec<Enr>,
     fork_name: ForkName,
     chain_spec: Arc<ChainSpec>,
-    service_name: String,
     disable_peer_scoring: bool,
     inbound_rate_limiter: Option<InboundRateLimiterConfig>,
 ) -> Libp2pInstance {
@@ -129,7 +128,7 @@ pub async fn build_libp2p_instance(
 
     let (signal, exit) = async_channel::bounded(1);
     let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
-    let executor = task_executor::TaskExecutor::new(rt, exit, shutdown_tx, service_name);
+    let executor = task_executor::TaskExecutor::new(rt, exit, shutdown_tx);
     let custody_group_count = chain_spec.custody_requirement;
     let libp2p_context = lighthouse_network::Context {
         config,
@@ -179,7 +178,6 @@ pub async fn build_node_pair(
         vec![],
         fork_name,
         spec.clone(),
-        "sender".to_string(),
         disable_peer_scoring,
         inbound_rate_limiter.clone(),
     )
@@ -189,7 +187,6 @@ pub async fn build_node_pair(
         vec![],
         fork_name,
         spec.clone(),
-        "receiver".to_string(),
         disable_peer_scoring,
         inbound_rate_limiter,
     )
@@ -268,16 +265,7 @@ pub async fn build_linear(
     let mut nodes = Vec::with_capacity(n);
     for _ in 0..n {
         nodes.push(
-            build_libp2p_instance(
+            build_libp2p_instance(rt.clone(), vec![], fork_name, spec.clone(), false, None).await,
-                rt.clone(),
-                vec![],
-                fork_name,
-                spec.clone(),
-                "linear".to_string(),
-                false,
-                None,
-            )
-            .await,
         );
     }
 

beacon_node/network/src/service/tests.rs

@@ -39,12 +39,7 @@ fn test_dht_persistence() {
 
     let (signal, exit) = async_channel::bounded(1);
     let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
-    let executor = task_executor::TaskExecutor::new(
+    let executor = task_executor::TaskExecutor::new(Arc::downgrade(&runtime), exit, shutdown_tx);
-        Arc::downgrade(&runtime),
-        exit,
-        shutdown_tx,
-        "test-dht-persistence".to_string(),
-    );
 
     let mut config = NetworkConfig::default();
     config.set_ipv4_listening_address(std::net::Ipv4Addr::UNSPECIFIED, 21212, 21212, 21213);
@@ -115,12 +110,8 @@ fn test_removing_topic_weight_on_old_topics() {
     let (mut network_service, network_globals, _network_senders) = runtime.block_on(async {
         let (_, exit) = async_channel::bounded(1);
         let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
-        let executor = task_executor::TaskExecutor::new(
+        let executor =
-            Arc::downgrade(&runtime),
+            task_executor::TaskExecutor::new(Arc::downgrade(&runtime), exit, shutdown_tx);
-            exit,
-            shutdown_tx,
-            "test-removing-topic-weight-on-old-topics".to_string(),
-        );
 
         let mut config = NetworkConfig::default();
         config.set_ipv4_listening_address(std::net::Ipv4Addr::UNSPECIFIED, 21214, 21214, 21215);

common/task_executor/src/lib.rs

@@ -83,11 +83,6 @@ pub struct TaskExecutor {
     /// The task must provide a reason for shutting down.
     signal_tx: Sender<ShutdownReason>,
 
-    /// The name of the service for inclusion in the logger output.
-    // FIXME(sproul): delete?
-    #[allow(dead_code)]
-    service_name: String,
-
     rayon_pool_provider: Arc<RayonPoolProvider>,
 }
 
@@ -103,28 +98,15 @@ impl TaskExecutor {
         handle: T,
         exit: async_channel::Receiver<()>,
         signal_tx: Sender<ShutdownReason>,
-        service_name: String,
     ) -> Self {
         Self {
             handle_provider: handle.into(),
             exit,
             signal_tx,
-            service_name,
             rayon_pool_provider: Arc::new(RayonPoolProvider::default()),
         }
     }
 
-    /// Clones the task executor adding a service name.
-    pub fn clone_with_name(&self, service_name: String) -> Self {
-        TaskExecutor {
-            handle_provider: self.handle_provider.clone(),
-            exit: self.exit.clone(),
-            signal_tx: self.signal_tx.clone(),
-            service_name,
-            rayon_pool_provider: self.rayon_pool_provider.clone(),
-        }
-    }
-
     /// A convenience wrapper for `Self::spawn` which ignores a `Result` as long as both `Ok`/`Err`
     /// are of type `()`.
     ///

common/task_executor/src/test_utils.rs

@@ -37,7 +37,7 @@ impl Default for TestRuntime {
             (Some(runtime), handle)
         };
 
-        let task_executor = TaskExecutor::new(handle, exit, shutdown_tx, "test".to_string());
+        let task_executor = TaskExecutor::new(handle, exit, shutdown_tx);
 
         Self {
             runtime,

lighthouse/environment/src/lib.rs

@@ -109,19 +109,6 @@ pub struct RuntimeContext<E: EthSpec> {
 }
 
 impl<E: EthSpec> RuntimeContext<E> {
-    /// Returns a sub-context of this context.
-    ///
-    /// The generated service will have the `service_name` in all it's logs.
-    pub fn service_context(&self, service_name: String) -> Self {
-        Self {
-            executor: self.executor.clone_with_name(service_name),
-            eth_spec_instance: self.eth_spec_instance.clone(),
-            eth2_config: self.eth2_config.clone(),
-            eth2_network_config: self.eth2_network_config.clone(),
-            sse_logging_components: self.sse_logging_components.clone(),
-        }
-    }
-
     /// Returns the `eth2_config` for this service.
     pub fn eth2_config(&self) -> &Eth2Config {
         &self.eth2_config
@@ -349,23 +336,6 @@ impl<E: EthSpec> Environment<E> {
                 Arc::downgrade(self.runtime()),
                 self.exit.clone(),
                 self.signal_tx.clone(),
-                "core".to_string(),
-            ),
-            eth_spec_instance: self.eth_spec_instance.clone(),
-            eth2_config: self.eth2_config.clone(),
-            eth2_network_config: self.eth2_network_config.clone(),
-            sse_logging_components: self.sse_logging_components.clone(),
-        }
-    }
-
-    /// Returns a `Context` where the `service_name` is added to the logger output.
-    pub fn service_context(&self, service_name: String) -> RuntimeContext<E> {
-        RuntimeContext {
-            executor: TaskExecutor::new(
-                Arc::downgrade(self.runtime()),
-                self.exit.clone(),
-                self.signal_tx.clone(),
-                service_name,
             ),
             eth_spec_instance: self.eth_spec_instance.clone(),
             eth2_config: self.eth2_config.clone(),

testing/execution_engine_integration/src/test_rig.rs

@@ -120,12 +120,7 @@ impl<Engine: GenericExecutionEngine> TestRig<Engine> {
         );
         let (runtime_shutdown, exit) = async_channel::bounded(1);
         let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
-        let executor = TaskExecutor::new(
+        let executor = TaskExecutor::new(Arc::downgrade(&runtime), exit, shutdown_tx);
-            Arc::downgrade(&runtime),
-            exit,
-            shutdown_tx,
-            "test".to_string(),
-        );
         let mut spec = TEST_FORK.make_genesis_spec(MainnetEthSpec::default_spec());
         spec.terminal_total_difficulty = Uint256::ZERO;
 

testing/simulator/src/basic_sim.rs

@@ -253,7 +253,6 @@ pub fn run_basic_sim(matches: &ArgMatches) -> Result<(), String> {
                         network_1
                             .add_validator_client_with_fallbacks(
                                 validator_config,
-                                i,
                                 beacon_nodes,
                                 files,
                             )

testing/simulator/src/fallback_sim.rs

@@ -249,12 +249,7 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> {
                         Some(SUGGESTED_FEE_RECIPIENT.into());
                     println!("Adding validator client {}", i);
                     network_1
-                        .add_validator_client_with_fallbacks(
+                        .add_validator_client_with_fallbacks(validator_config, beacon_nodes, files)
-                            validator_config,
-                            i,
-                            beacon_nodes,
-                            files,
-                        )
                         .await
                         .expect("should add validator");
                 },

testing/simulator/src/local_network.rs

@@ -206,10 +206,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT.try_into().expect("non zero"));
         beacon_config.network.discv5_config.table_filter = |_| true;
 
-        let execution_node = LocalExecutionNode::new(
+        let execution_node = LocalExecutionNode::new(self.context.clone(), mock_execution_config);
-            self.context.service_context("boot_node_el".into()),
-            mock_execution_config,
-        );
 
         beacon_config.execution_layer = Some(execution_layer::Config {
             execution_endpoint: Some(SensitiveUrl::parse(&execution_node.server.url()).unwrap()),
@@ -218,11 +215,7 @@ impl<E: EthSpec> LocalNetwork<E> {
             ..Default::default()
         });
 
-        let beacon_node = LocalBeaconNode::production(
+        let beacon_node = LocalBeaconNode::production(self.context.clone(), beacon_config).await?;
-            self.context.service_context("boot_node".into()),
-            beacon_config,
-        )
-        .await?;
 
         Ok((beacon_node, execution_node))
     }
@@ -252,10 +245,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         mock_execution_config.server_config.listen_port = EXECUTION_PORT + count;
 
         // Construct execution node.
-        let execution_node = LocalExecutionNode::new(
+        let execution_node = LocalExecutionNode::new(self.context.clone(), mock_execution_config);
-            self.context.service_context(format!("node_{}_el", count)),
-            mock_execution_config,
-        );
 
         // Pair the beacon node and execution node.
         beacon_config.execution_layer = Some(execution_layer::Config {
@@ -266,11 +256,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         });
 
         // Construct beacon node using the config,
-        let beacon_node = LocalBeaconNode::production(
+        let beacon_node = LocalBeaconNode::production(self.context.clone(), beacon_config).await?;
-            self.context.service_context(format!("node_{}", count)),
-            beacon_config,
-        )
-        .await?;
 
         Ok((beacon_node, execution_node))
     }
@@ -343,9 +329,7 @@ impl<E: EthSpec> LocalNetwork<E> {
         beacon_node: usize,
         validator_files: ValidatorFiles,
     ) -> Result<(), String> {
-        let context = self
+        let context = self.context.clone();
-            .context
-            .service_context(format!("validator_{}", beacon_node));
         let self_1 = self.clone();
         let socket_addr = {
             let read_lock = self.beacon_nodes.read();
@@ -401,13 +385,10 @@ impl<E: EthSpec> LocalNetwork<E> {
     pub async fn add_validator_client_with_fallbacks(
         &self,
         mut validator_config: ValidatorConfig,
-        validator_index: usize,
         beacon_nodes: Vec<usize>,
         validator_files: ValidatorFiles,
     ) -> Result<(), String> {
-        let context = self
+        let context = self.context.clone();
-            .context
-            .service_context(format!("validator_{}", validator_index));
         let self_1 = self.clone();
         let mut beacon_node_urls = vec![];
         for beacon_node in beacon_nodes {

testing/web3signer_tests/src/lib.rs

@@ -345,12 +345,7 @@ mod tests {
             );
             let (runtime_shutdown, exit) = async_channel::bounded(1);
             let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
-            let executor = TaskExecutor::new(
+            let executor = TaskExecutor::new(Arc::downgrade(&runtime), exit, shutdown_tx);
-                Arc::downgrade(&runtime),
-                exit,
-                shutdown_tx,
-                "test".to_string(),
-            );
 
             let slashing_db_path = validator_dir.path().join(SLASHING_PROTECTION_FILENAME);
             let slashing_protection = SlashingDatabase::open_or_create(&slashing_db_path).unwrap();

validator_client/src/lib.rs

@@ -56,8 +56,6 @@ const RETRY_DELAY: Duration = Duration::from_secs(2);
 /// The time between polls when waiting for genesis.
 const WAITING_FOR_GENESIS_POLL_TIME: Duration = Duration::from_secs(12);
 
-const DOPPELGANGER_SERVICE_NAME: &str = "doppelganger";
-
 /// Compute attestation selection proofs this many slots before they are required.
 ///
 /// At start-up selection proofs will be computed with less lookahead out of necessity.
@@ -628,8 +626,7 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
         if let Some(doppelganger_service) = self.doppelganger_service.clone() {
             DoppelgangerService::start_update_service(
                 doppelganger_service,
-                self.context
+                self.context.clone(),
-                    .service_context(DOPPELGANGER_SERVICE_NAME.into()),
                 self.validator_store.clone(),
                 self.duties_service.beacon_nodes.clone(),
                 self.duties_service.slot_clock.clone(),
@@ -639,7 +636,7 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
             info!("Doppelganger protection disabled.")
         }
 
-        let context = self.context.service_context("notifier".into());
+        let context = self.context.clone();
         spawn_notifier(
             self.duties_service.clone(),
             context.executor,