remove unnecessary Context override param

bin/mev/src/cmd/boost.rs

@@ -21,7 +21,7 @@ impl Command {
         info!("configured for {network}");
 
         if let Some(config) = config.boost {
-            Ok(Service::from(network, config).spawn(None)?.await?)
+            Ok(Service::from(network, config).spawn()?.await?)
         } else {
             Err(anyhow!("missing boost config from file provided"))
         }

bin/mev/src/cmd/relay.rs

@@ -35,7 +35,7 @@ impl Command {
         info!("configured for {network}");
 
         if let Some(config) = config.relay {
-            let service = Service::from(network, config).spawn(None).await?;
+            let service = Service::from(network, config).spawn().await?;
             Ok(service.await?)
         } else {
             Err(anyhow!("missing relay config from file provided"))

mev-boost-rs/src/service.rs

@@ -58,7 +58,7 @@ impl Service {
     }
 
     /// Spawns a new [`RelayMux`] and [`BlindedBlockProviderServer`] task
-    pub fn spawn(self, context: Option<Context>) -> Result<ServiceHandle, Error> {
+    pub fn spawn(self) -> Result<ServiceHandle, Error> {
         let Self { host, port, relays, network } = self;
 
         if relays.is_empty() {
@@ -71,8 +71,7 @@ impl Service {
             }
         }
 
-        let context =
-            if let Some(context) = context { context } else { Context::try_from(&network)? };
+        let context = Context::try_from(&network)?;
         let relays = relays.into_iter().map(Relay::from);
         let clock = context.clock().unwrap_or_else(|| {
             let genesis_time = networks::typical_genesis_time(&context);

mev-boost-rs/tests/integration.rs

@@ -75,10 +75,8 @@ async fn test_end_to_end() {
 
     let genesis_validators_root = Root::try_from([23u8; 32].as_ref()).unwrap();
 
-    let mut context = Context::for_mainnet();
-    // mock epoch values to transition across forks
-    context.bellatrix_fork_epoch = 12;
-    context.capella_fork_epoch = 22;
+    let network = Network::Sepolia;
+    let context = Context::try_from(&network).unwrap();
 
     // NOTE: non-default secret key required. otherwise public key is point at infinity and
     // signature verification will fail.
@@ -94,12 +92,11 @@ async fn test_end_to_end() {
 
     // start mux server
     let mut config = Config::default();
-    config.relays.push(format!("http://{relay_public_key}@127.0.0.1:{port}"));
+    config.relays.push(format!("http://{relay_public_key:?}@127.0.0.1:{port}"));
 
     let mux_port = config.port;
-    let network = Network::Sepolia;
     let service = Service::from(network, config);
-    service.spawn(Some(context.clone())).unwrap();
+    service.spawn().unwrap();
 
     let beacon_node = RelayClient::new(ApiClient::new(
         Url::parse(&format!("http://127.0.0.1:{mux_port}")).unwrap(),
@@ -142,8 +139,8 @@ async fn propose_block(
 ) {
     let fork = if shuffling_index == 0 { Fork::Bellatrix } else { Fork::Capella };
     let current_slot = match fork {
-        Fork::Bellatrix => 32 + context.bellatrix_fork_epoch * context.slots_per_epoch,
-        Fork::Capella => 32 + context.capella_fork_epoch * context.slots_per_epoch,
+        Fork::Bellatrix => 30 + context.bellatrix_fork_epoch * context.slots_per_epoch,
+        Fork::Capella => 30 + context.capella_fork_epoch * context.slots_per_epoch,
         _ => unimplemented!(),
     };
     let parent_hash = Hash32::try_from([shuffling_index as u8; 32].as_ref()).unwrap();

mev-relay-rs/src/service.rs

@@ -54,11 +54,10 @@ impl Service {
 
     /// Configures the [`Relay`] and the [`BlindedBlockProviderServer`] and spawns both to
     /// individual tasks
-    pub async fn spawn(self, context: Option<Context>) -> Result<ServiceHandle, Error> {
+    pub async fn spawn(self) -> Result<ServiceHandle, Error> {
         let Self { host, port, beacon_node, network, secret_key } = self;
 
-        let context =
-            if let Some(context) = context { context } else { Context::try_from(&network)? };
+        let context = Context::try_from(&network)?;
         let clock = context.clock().unwrap_or_else(|| {
             let genesis_time = networks::typical_genesis_time(&context);
             context.clock_at(genesis_time)