apollo_batcher,apollo_central_sync_config: Sensitive code cleanup (#10487)

Author: victorkstarkware

crates/apollo_batcher/src/pre_confirmed_cende_client_test.rs

@@ -12,6 +12,7 @@ use starknet_api::block::{
 use starknet_api::core::ContractAddress;
 use starknet_api::data_availability::L1DataAvailabilityMode;
 use starknet_api::felt;
+use url::Url;
 
 use super::pre_confirmed_cende_client::{
     CendeWritePreconfirmedBlock,
@@ -32,7 +33,7 @@ const TEST_SEQUENCER_ADDRESS: &str = "0x111";
 
 fn test_cende_client(server: &mut ServerGuard) -> PreconfirmedCendeClient {
     let config =
-        PreconfirmedCendeConfig { recorder_url: Sensitive::new(server.url().parse().unwrap()) };
+        PreconfirmedCendeConfig { recorder_url: server.url().parse::<Url>().unwrap().into() };
     PreconfirmedCendeClient::new(config)
 }
 

crates/apollo_central_sync_config/src/config.rs

@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::time::Duration;
 
 use apollo_config::converters::{
-    deserialize_optional_map,
+    deserialize_optional_sensitive_map,
     deserialize_seconds_to_duration,
     serialize_optional_map,
 };
@@ -11,7 +11,7 @@ use apollo_config::secrets::Sensitive;
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use apollo_starknet_client::RetryConfig;
 use itertools::chain;
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Serialize};
 use url::Url;
 use validator::Validate;
 
@@ -190,14 +190,3 @@ impl Default for SyncConfig {
         }
     }
 }
-
-// Deserializes a sensitive map from "k1:v1 k2:v2" string structure.
-fn deserialize_optional_sensitive_map<'de, D>(
-    de: D,
-) -> Result<Option<Sensitive<HashMap<String, String>>>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let optional_map = deserialize_optional_map(de)?;
-    Ok(optional_map.map(Sensitive::new))
-}

crates/apollo_config/src/converters.rs

@@ -93,6 +93,17 @@ where
     Ok(Some(map))
 }
 
+/// Deserializes a sensitive map from "k1:v1 k2:v2" string structure.
+pub fn deserialize_optional_sensitive_map<'de, D>(
+    de: D,
+) -> Result<Option<Sensitive<HashMap<String, String>>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let optional_map = deserialize_optional_map(de)?;
+    Ok(optional_map.map(Sensitive::new))
+}
+
 /// A struct containing a URL and its associated headers.
 #[derive(Clone, Deserialize, Serialize, PartialEq)]
 pub struct UrlAndHeaders {