Merge branch 'update-cbst2-02' into signer-json-api

Author: jclapis

crates/signer/src/service.rs

@@ -485,19 +485,19 @@ async fn handle_reload(
         let mut jwt_configs = state.jwts.write();
         let mut new_configs = HashMap::new();
         for (module_id, jwt_secret) in jwt_secrets {
-            let signing_id = jwt_configs.get(&module_id).map(|cfg| cfg.signing_id);
-            if signing_id.is_none() {
+            if let Some(signing_id) = jwt_configs.get(&module_id).map(|cfg| cfg.signing_id) {
+                new_configs.insert(module_id.clone(), ModuleSigningConfig {
+                    module_name: module_id,
+                    jwt_secret,
+                    signing_id,
+                });
+            } else {
                 let error_message = format!(
                     "Module {module_id} signing ID not found in commit-boost config, cannot reload"
                 );
                 error!(event = "reload", ?req_id, module_id = %module_id, error = %error_message);
                 return Err(SignerModuleError::RequestError(error_message));
             }
-            new_configs.insert(module_id.clone(), ModuleSigningConfig {
-                module_name: module_id,
-                jwt_secret,
-                signing_id: signing_id.unwrap(),
-            });
         }
         *jwt_configs = new_configs;
     }

tests/tests/signer_jwt_auth.rs

@@ -178,43 +178,3 @@ async fn test_signer_only_admin_can_revoke() -> Result<()> {
 
     Ok(())
 }
-
-// Starts the signer moduler server on a separate task and returns its
-// configuration
-/*
-async fn start_server(port: u16) -> Result<StartSignerConfig> {
-    setup_test_env();
-    let chain = Chain::Hoodi;
-
-    // Mock JWT secrets
-    let module_id = ModuleId(JWT_MODULE.to_string());
-    let mut jwts = HashMap::new();
-    jwts.insert(module_id.clone(), JWT_SECRET.to_string());
-
-    // Create a signer config
-    let loader = SignerLoader::ValidatorsDir {
-        keys_path: "data/keystores/keys".into(),
-        secrets_path: "data/keystores/secrets".into(),
-        format: ValidatorKeysFormat::Lighthouse,
-    };
-    let mut config = get_signer_config(loader);
-    config.port = port;
-    config.jwt_auth_fail_limit = 3; // Set a low fail limit for testing
-    config.jwt_auth_fail_timeout_seconds = 3; // Set a short timeout for testing
-    let start_config = get_start_signer_config(config, chain, jwts, ADMIN_SECRET.to_string());
-
-    // Run the Signer
-    let server_handle = tokio::spawn(SigningService::run(start_config.clone()));
-
-    // Make sure the server is running
-    tokio::time::sleep(Duration::from_millis(100)).await;
-    if server_handle.is_finished() {
-        return Err(eyre::eyre!(
-            "Signer service failed to start: {}",
-            server_handle.await.unwrap_err()
-        ));
-    }
-    Ok(start_config)
-}
-
-*/