f - validate latency in cli and make u32

Author: elnosh

sim-cli/src/main.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use clap::Parser;
 use log::LevelFilter;
 use sim_cli::parsing::{create_simulation, create_simulation_with_network, parse_sim_params, Cli};
-use simln_lib::{interceptors::LatencyIntercepor, sim_node::Interceptor};
+use simln_lib::{latency_interceptor::LatencyIntercepor, sim_node::Interceptor};
 use simple_logger::SimpleLogger;
 use tokio_util::task::TaskTracker;
 
@@ -32,8 +32,9 @@ async fn main() -> anyhow::Result<()> {
     let (sim, validated_activities) = if sim_params.sim_network.is_empty() {
         create_simulation(&cli, &sim_params, tasks.clone()).await?
     } else {
-        let interceptors = if let Some(l) = cli.latency_ms {
-            vec![Arc::new(LatencyIntercepor::new_poisson(l)?) as Arc<dyn Interceptor>]
+        let latency = cli.latency_ms.unwrap_or(0);
+        let interceptors = if latency > 0 {
+            vec![Arc::new(LatencyIntercepor::new_poisson(latency as f32)?) as Arc<dyn Interceptor>]
         } else {
             vec![]
         };

sim-cli/src/parsing.rs

@@ -88,9 +88,10 @@ pub struct Cli {
     /// simulated nodes.
     #[clap(long)]
     pub speedup_clock: Option<u16>,
-    /// Latency to optionally introduce for simulated nodes.
+    /// Latency to optionally introduce for payments in a simulated network expressed in
+    /// milliseconds.
     #[clap(long)]
-    pub latency_ms: Option<f32>,
+    pub latency_ms: Option<u32>,
 }
 
 impl Cli {
@@ -116,6 +117,12 @@ impl Cli {
             ));
         }
 
+        if !sim_params.nodes.is_empty() && self.latency_ms.is_some() {
+            return Err(anyhow!(
+                "Latency for payments is only allowed when running on a simulated network"
+            ));
+        }
+
         Ok(())
     }
 }