Refactor configuration loading and network address parsing for improved readability. Simplify the logic in load_or_default method and enhance variable naming in the bootstrap peers loop.

Author: taisirhassan

src/infrastructure/config.rs

@@ -75,12 +75,11 @@ impl Default for AppConfig {
 impl AppConfig {
     /// Load configuration from file or create default
     pub fn load_or_default(config_path: Option<&str>) -> Self {
-        if let Some(path) = config_path {
-            if let Ok(content) = std::fs::read_to_string(path) {
-                if let Ok(config) = serde_json::from_str(&content) {
-                    return config;
-                }
-            }
+        if let Some(config) = config_path
+            .and_then(|path| std::fs::read_to_string(path).ok())
+            .and_then(|content| serde_json::from_str(&content).ok())
+        {
+            return config;
         }
         Self::default()
     }

src/infrastructure/network.rs

@@ -146,8 +146,8 @@ impl LibP2pNetworkService {
             "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
         ];
 
-        for addr in &bootstrap_peers {
-            if let Ok(addr) = addr.parse::<Multiaddr>() {
+        for addr_str in &bootstrap_peers {
+            if let Ok(addr) = addr_str.parse::<Multiaddr>() {
                 if let Some(peer_id) = addr.iter().find_map(|p| {
                     if let libp2p::multiaddr::Protocol::P2p(peer_id) = p {
                         Some(peer_id)
@@ -234,12 +234,12 @@ impl LibP2pNetworkService {
                     // Trigger Kademlia bootstrap once we start listening
                     if !bootstrap_attempted {
                         if let SwarmEvent::NewListenAddr { .. } = event {
-                            if let Err(e) = swarm.behaviour_mut().kademlia.bootstrap() {
-                                warn!("Kademlia bootstrap failed: {:?}", e);
-                            } else {
-                                info!("Kademlia bootstrap initiated successfully");
-                                bootstrap_attempted = true;
-                            }
+                        if let Err(e) = swarm.behaviour_mut().kademlia.bootstrap() {
+                            warn!("Kademlia bootstrap failed: {:?}", e);
+                        } else {
+                            info!("Kademlia bootstrap initiated successfully");
+                            bootstrap_attempted = true;
+                        }
                         }
                     }