fixup! sim-ln/style: Fix Formatting Issues

Author: chuksys

simln-lib/src/eclair.rs

@@ -247,10 +247,10 @@ impl LightningNode for EclairNode {
 
     async fn get_graph(&mut self) -> Result<Graph, LightningError> {
         let nodes: NodesResponse = self
-        .client
-        .request("nodes", None)
-        .await
-        .map_err(|err| LightningError::GetNodeInfoError(err.to_string()))?;
+            .client
+            .request("nodes", None)
+            .await
+            .map_err(|err| LightningError::GetNodeInfoError(err.to_string()))?;
 
         let mut nodes_by_pk: HashMap<PublicKey, NodeInfo> = HashMap::new();
         let mut nodes_by_alias: HashMap<String, Vec<NodeInfo>> = HashMap::new();
@@ -262,7 +262,7 @@ impl LightningNode for EclairNode {
                 NodeInfo {
                     pubkey: PublicKey::from_str(&node.node_id).expect("Public Key not valid"),
                     alias: node.alias.clone(),
-                    features:  parse_json_to_node_features(&node.features),
+                    features: parse_json_to_node_features(&node.features),
                 },
             );
             if nodes_by_alias.contains_key(&node.alias) {
@@ -271,7 +271,7 @@ impl LightningNode for EclairNode {
                     updated_alias_nodes.extend(vec![NodeInfo {
                         pubkey: PublicKey::from_str(&node.node_id).expect("Public Key not valid"),
                         alias: node.alias.clone(),
-                        features:  parse_json_to_node_features(&node.features),
+                        features: parse_json_to_node_features(&node.features),
                     }]);
                     nodes_by_alias.insert(node.alias.clone(), updated_alias_nodes);
                 }
@@ -281,7 +281,7 @@ impl LightningNode for EclairNode {
                     vec![NodeInfo {
                         pubkey: PublicKey::from_str(&node.node_id).expect("Public Key not valid"),
                         alias: node.alias,
-                        features:  parse_json_to_node_features(&node.features),
+                        features: parse_json_to_node_features(&node.features),
                     }],
                 );
             }

simln-lib/src/sim_node.rs

@@ -7,6 +7,7 @@ use bitcoin::secp256k1::PublicKey;
 use bitcoin::{Network, ScriptBuf, TxOut};
 use lightning::ln::chan_utils::make_funding_redeemscript;
 use std::collections::{hash_map::Entry, HashMap};
+use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tokio_util::task::TaskTracker;
@@ -646,16 +647,17 @@ impl<T: SimNetwork> LightningNode for SimNode<'_, T> {
 
     async fn get_graph(&mut self) -> Result<Graph, LightningError> {
         let nodes = self.network.lock().await.fetch_nodes().await?;
-        
-        let nodes_by_pk = HashMap::new();
+
+        let mut nodes_by_pk = HashMap::new();
         let nodes_by_alias = HashMap::new();
         let channels = HashMap::new();
 
         for node in nodes {
             nodes_by_pk.insert(
-                PublicKey::from_str(&node.pubkey).expect("Public Key not valid"),
+                PublicKey::from_str(&node.pubkey.to_string()).expect("Public Key not valid"),
                 NodeInfo {
-                    pubkey: PublicKey::from_str(&node.pubkey).expect("Public Key not valid"),
+                    pubkey: PublicKey::from_str(&node.pubkey.to_string())
+                        .expect("Public Key not valid"),
                     alias: node.alias.clone(),
                     features: node.features,
                 },
@@ -872,9 +874,9 @@ impl SimNetwork for SimGraph {
         for node in &self.nodes {
             nodes.push(node_info(*node.0));
         }
-        
-        Ok(nodes)    
-    } 
+
+        Ok(nodes)
+    }
 }
 
 /// Adds htlcs to the simulation state along the path provided. Returning the index in the path from which to fail