fixup! refactor: move parsing into its own module

Author: root

sim-cli/src/lib.rs

@@ -1 +1 @@
-pub mod parsing;
+pub mod parsing;

sim-cli/src/main.rs

@@ -1,8 +1,7 @@
+use clap::Parser;
 use log::LevelFilter;
+use sim_cli::parsing::{create_simulation, Cli};
 use simple_logger::SimpleLogger;
-use sim_cli::parsing::{Cli, create_simulation};
-use clap::Parser;
-
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -32,4 +31,4 @@ async fn main() -> anyhow::Result<()> {
     sim.run().await?;
 
     Ok(())
-}
+}

sim-cli/src/parsing.rs

@@ -1,17 +1,17 @@
-use bitcoin::secp256k1::PublicKey;
 use anyhow::anyhow;
+use bitcoin::secp256k1::PublicKey;
 use clap::{builder::TypedValueParser, Parser};
-use std::path::PathBuf;
+use log::LevelFilter;
 use serde::{Deserialize, Serialize};
 use simln_lib::{
-    Amount, Interval, cln, lnd, serializers, NodeId, SimulationCfg, Simulation, WriteResults, LightningError, LightningNode, 
-    cln::ClnNode, lnd::LndNode, ActivityDefinition, NodeInfo
+    cln, cln::ClnNode, lnd, lnd::LndNode, serializers, ActivityDefinition, Amount, Interval,
+    LightningError, LightningNode, NodeId, NodeInfo, Simulation, SimulationCfg, WriteResults,
 };
-use log::LevelFilter;
-use std::sync::Arc;
+use std::collections::HashMap;
 use std::fs;
+use std::path::PathBuf;
+use std::sync::Arc;
 use tokio::sync::Mutex;
-use std::collections::HashMap;
 
 /// The default directory where the simulation files are stored and where the results will be written to.
 pub const DEFAULT_DATA_DIR: &str = ".";
@@ -138,10 +138,7 @@ impl TryFrom<&Cli> for SimulationCfg {
 
 /// Parses the cli options provided and creates a simulation to be run, connecting to lightning nodes and validating
 /// any activity described in the simulation file.
-pub async fn create_simulation(
-    cli: &Cli,
-) -> Result<Simulation, anyhow::Error> {
-
+pub async fn create_simulation(cli: &Cli) -> Result<Simulation, anyhow::Error> {
     let cfg: SimulationCfg = SimulationCfg::try_from(cli)?;
 
     let sim_path = read_sim_path(cli.data_dir.clone(), cli.sim_file.clone()).await?;
@@ -168,12 +165,8 @@ pub async fn create_simulation(
         ))
     };
 
-    let validated_activities = validate_activities(
-        activity, 
-        &clients_info, 
-        get_node
-    ).await?;
-    
+    let validated_activities = validate_activities(activity, &clients_info, get_node).await?;
+
     Ok(Simulation::new(cfg, clients, validated_activities))
 }
 
@@ -212,7 +205,7 @@ async fn get_clients(
 /// Adds a lightning node to a client map and tracking maps used to lookup node pubkeys and aliases for activity
 /// validation.
 async fn add_node_to_maps(
-    nodes: &HashMap<PublicKey, NodeInfo>
+    nodes: &HashMap<PublicKey, NodeInfo>,
 ) -> Result<(HashMap<PublicKey, NodeInfo>, HashMap<String, NodeInfo>), LightningError> {
     let mut pk_node_map = HashMap::new();
     let mut alias_node_map = HashMap::new();
@@ -255,10 +248,6 @@ async fn validate_activities(
     nodes: &HashMap<PublicKey, NodeInfo>,
     get_node_info: impl AsyncFn(&PublicKey) -> Result<NodeInfo, LightningError>,
 ) -> Result<Vec<ActivityDefinition>, LightningError> {
-    if activity.is_empty() {
-        return Ok(vec![]);
-    }
-
     let mut validated_activities = vec![];
     let (pk_node_map, alias_node_map) = add_node_to_maps(nodes).await?;
 

simln-lib/src/lib.rs

@@ -119,7 +119,6 @@ impl std::fmt::Display for ShortChannelID {
     }
 }
 
-
 /// Either a value or a range parsed from the simulation file.
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 #[serde(untagged)]