comments

Author: ltitanb

crates/common/src/config/mux.rs

@@ -41,7 +41,7 @@ impl PbsMuxes {
 
         let mut configs = HashMap::new();
         // fill the configs using the default pbs config and relay entries
-        for mux in self.muxes.into_iter() {
+        for mux in self.muxes {
             ensure!(!mux.relays.is_empty(), "mux config must have at least one relay");
             ensure!(
                 !mux.validator_pubkeys.is_empty(),

crates/common/src/config/pbs.rs

@@ -181,10 +181,11 @@ pub fn load_pbs_config() -> Result<PbsModuleConfig> {
         SocketAddr::from((config.pbs.pbs_config.host, config.pbs.pbs_config.port))
     };
 
-    let muxes = match config.muxes {
-        Some(muxes) => Some(muxes.validate_and_fill(&config.pbs.pbs_config, &config.relays)?),
-        None => None,
-    };
+    let muxes = config
+        .muxes
+        .map(|muxes| muxes.validate_and_fill(&config.pbs.pbs_config, &config.relays))
+        .transpose()?;
+
     let relay_clients =
         config.relays.into_iter().map(RelayClient::new).collect::<Result<Vec<_>>>()?;
     let maybe_publiher = BuilderEventPublisher::new_from_env()?;