reformat and fix broken tests

Author: JasonVranek

crates/common/src/config/mux.rs

@@ -19,12 +19,11 @@ use tracing::{debug, info, warn};
 use url::Url;
 
 use super::{MUX_PATH_ENV, PbsConfig, RelayConfig, load_optional_env_var};
-use crate::types::StaderPool;
 use crate::{
     config::{remove_duplicate_keys, safe_read_http_response},
     interop::{lido::utils::*, ssv::utils::*, stader::utils::*},
     pbs::RelayClient,
-    types::{BlsPublicKey, Chain},
+    types::{BlsPublicKey, Chain, StaderPool},
     utils::default_bool,
 };
 
@@ -157,7 +156,7 @@ pub struct MuxConfig {
 
 impl MuxConfig {
     /// Returns the env, actual path, and internal path to use for the file
-    /// loader. In File mode, validates the mux file prior to returning.   
+    /// loader. In File mode, validates the mux file prior to returning.
     pub fn loader_env(&self) -> eyre::Result<Option<(String, String, String)>> {
         let Some(loader) = self.loader.as_ref() else {
             return Ok(None);
@@ -260,29 +259,19 @@ impl MuxKeysLoader {
                         bail!("Lido registry requires RPC URL to be set in the PBS config");
                     };
 
-                        fetch_lido_registry_keys(
-                            rpc_url,
-                            chain,
-                            U256::from(*node_operator_id),
-                            lido_module_id.unwrap_or(1),
-                            http_timeout,
-                        )
-                        .await
-                    }
-                    NORegistry::SSV => {
-                        fetch_ssv_pubkeys(
-                            ssv_node_api_url,
-                            ssv_public_api_url,
-                            chain,
-                            U256::from(*node_operator_id),
-                            http_timeout,
-                        )
-                        .await
-                    }
+                    fetch_lido_registry_keys(
+                        rpc_url,
+                        chain,
+                        U256::from(*node_operator_id),
+                        lido_module_id.unwrap_or(1),
+                        http_timeout,
+                    )
+                    .await
                 }
                 NORegistry::SSV => {
                     fetch_ssv_pubkeys(
-                        ssv_api_url,
+                        ssv_node_api_url,
+                        ssv_public_api_url,
                         chain,
                         U256::from(*node_operator_id),
                         http_timeout,

crates/common/src/interop/stader/utils.rs

@@ -1,12 +1,17 @@
 use std::collections::HashMap;
 
-use crate::interop::stader::types::StaderRegistry;
-use crate::types::{Chain, StaderPool};
-use alloy::primitives::{Address, Bytes, U256, address};
-use alloy::rpc::types::beacon::constants::BLS_PUBLIC_KEY_BYTES_LEN;
+use alloy::{
+    primitives::{Address, Bytes, U256, address},
+    rpc::types::beacon::constants::BLS_PUBLIC_KEY_BYTES_LEN,
+};
 use eyre::ensure;
 use lazy_static::lazy_static;
 
+use crate::{
+    interop::stader::types::StaderRegistry,
+    types::{Chain, StaderPool},
+};
+
 const REGISTRY_CALL_BATCH_SIZE: u64 = 250u64;
 
 lazy_static! {

tests/tests/pbs_mux.rs

@@ -320,6 +320,7 @@ async fn test_ssv_multi_with_node() -> Result<()> {
         node_operator_id: 1,
         lido_module_id: None,
         registry: cb_common::config::NORegistry::SSV,
+        stader_pool: None,
     };
     let muxes = PbsMuxes {
         muxes: vec![MuxConfig {
@@ -358,7 +359,7 @@ async fn test_ssv_multi_with_node() -> Result<()> {
     info!("Sending get header");
     let res = mock_validator.do_get_header(Some(pubkey2.clone())).await?;
     assert_eq!(res.status(), StatusCode::OK);
-    assert_eq!(relay_state.received_get_header(), 1); // pubkey2 was loaded from the SSV node 
+    assert_eq!(relay_state.received_get_header(), 1); // pubkey2 was loaded from the SSV node
 
     // Shut down the server handles
     pbs_server.abort();
@@ -416,6 +417,7 @@ async fn test_ssv_multi_with_public() -> Result<()> {
         node_operator_id: 1,
         lido_module_id: None,
         registry: cb_common::config::NORegistry::SSV,
+        stader_pool: None,
     };
     let muxes = PbsMuxes {
         muxes: vec![MuxConfig {
@@ -454,7 +456,7 @@ async fn test_ssv_multi_with_public() -> Result<()> {
     info!("Sending get header");
     let res = mock_validator.do_get_header(Some(pubkey2.clone())).await?;
     assert_eq!(res.status(), StatusCode::OK);
-    assert_eq!(relay_state.received_get_header(), 1); // pubkey2 was loaded from the SSV public API 
+    assert_eq!(relay_state.received_get_header(), 1); // pubkey2 was loaded from the SSV public API
 
     // Shut down the server handles
     pbs_server.abort();

tests/tests/pbs_mux_refresh.rs

@@ -74,7 +74,7 @@ async fn test_auto_refresh() -> Result<()> {
         node_operator_id: 1,
         lido_module_id: None,
         registry: cb_common::config::NORegistry::SSV,
-        stader_pool: None
+        stader_pool: None,
     };
     let muxes = PbsMuxes {
         muxes: vec![MuxConfig {