Remove redunancy for execution engines

beacon_node/beacon_chain/src/test_utils.rs

@@ -15,7 +15,7 @@ use execution_layer::{
     test_utils::{
         ExecutionBlockGenerator, ExecutionLayerRuntime, MockExecutionLayer, DEFAULT_TERMINAL_BLOCK,
     },
-    ExecutionLayer,
+    ExecutionLayer, DEFAULT_JWT_FILE,
 };
 use futures::channel::mpsc::Receiver;
 pub use genesis::{interop_genesis_state, DEFAULT_ETH1_BLOCK_HASH};
@@ -37,6 +37,7 @@ use state_processing::{
 };
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -324,23 +325,17 @@ where
         self
     }
 
-    pub fn execution_layer(mut self, urls: &[&str]) -> Self {
+    pub fn execution_layer(mut self, url: &str) -> Self {
         assert!(
             self.execution_layer.is_none(),
             "execution layer already defined"
         );
 
         let el_runtime = ExecutionLayerRuntime::default();
 
-        let urls: Vec<SensitiveUrl> = urls
-            .iter()
-            .map(|s| SensitiveUrl::parse(*s))
-            .collect::<Result<_, _>>()
-            .unwrap();
-
         let config = execution_layer::Config {
-            execution_endpoints: urls,
-            secret_files: vec![],
+            execution_endpoint: SensitiveUrl::parse(url).unwrap(),
+            secret_file: PathBuf::from(DEFAULT_JWT_FILE),
             suggested_fee_recipient: Some(Address::repeat_byte(42)),
             ..Default::default()
         };

beacon_node/client/src/builder.rs

@@ -700,9 +700,6 @@ where
                         );
                     }
 
-                    // Spawn a routine that tracks the status of the execution engines.
-                    execution_layer.spawn_watchdog_routine(beacon_chain.slot_clock.clone());
-
                     // Spawn a routine that removes expired proposer preparations.
                     execution_layer.spawn_clean_proposer_caches_routine::<TSlotClock, TEthSpec>(
                         beacon_chain.slot_clock.clone(),

beacon_node/execution_layer/src/engine_api.rs

@@ -1,4 +1,4 @@
-use crate::engines::ForkChoiceState;
+use crate::ForkChoiceState;
 use async_trait::async_trait;
 use eth1::http::RpcError;
 pub use json_structures::TransitionConfigurationV1;