Merge pull request #238 from chuksys/activity-validation-params

sim-cli/refactor: do not call add_node_to_maps in validate_activities

Author: carlaKC

sim-cli/src/parsing.rs

@@ -169,7 +169,10 @@ pub async fn create_simulation(cli: &Cli) -> Result<Simulation, anyhow::Error> {
         ))
     };
 
-    let validated_activities = validate_activities(activity, &clients_info, get_node).await?;
+    let (pk_node_map, alias_node_map) = add_node_to_maps(&clients_info).await?;
+
+    let validated_activities =
+        validate_activities(activity, pk_node_map, alias_node_map, get_node).await?;
     let tasks = TaskTracker::new();
 
     Ok(Simulation::new(cfg, clients, validated_activities, tasks))
@@ -251,11 +254,11 @@ async fn add_node_to_maps(
 /// have been configured.
 async fn validate_activities(
     activity: Vec<ActivityParser>,
-    nodes: &HashMap<PublicKey, NodeInfo>,
+    pk_node_map: HashMap<PublicKey, NodeInfo>,
+    alias_node_map: HashMap<String, NodeInfo>,
     get_node_info: impl AsyncFn(&PublicKey) -> Result<NodeInfo, LightningError>,
 ) -> Result<Vec<ActivityDefinition>, LightningError> {
     let mut validated_activities = vec![];
-    let (pk_node_map, alias_node_map) = add_node_to_maps(nodes).await?;
 
     // Make all the activities identifiable by PK internally
     for act in activity.into_iter() {