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

Author: chuksys

sim-cli/src/parsing.rs

@@ -119,12 +119,6 @@ struct ActivityParser {
     pub amount_msat: Amount,
 }
 
-struct ActivityValidationParams {
-    activity: Vec<ActivityParser>,
-    pk_node_map: HashMap<PublicKey, NodeInfo>,
-    alias_node_map: HashMap<String, NodeInfo>,
-}
-
 impl TryFrom<&Cli> for SimulationCfg {
     type Error = anyhow::Error;
 
@@ -177,13 +171,7 @@ pub async fn create_simulation(cli: &Cli) -> Result<Simulation, anyhow::Error> {
 
     let (pk_node_map, alias_node_map) = add_node_to_maps(&clients_info).await?;
 
-    let activity_validation_params = ActivityValidationParams {
-        activity,
-        pk_node_map,
-        alias_node_map,
-    };
-
-    let validated_activities = validate_activities(activity_validation_params, get_node).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))
@@ -264,17 +252,13 @@ async fn add_node_to_maps(
 /// Validates a set of defined activities, cross-checking aliases and public keys against the set of clients that
 /// have been configured.
 async fn validate_activities(
-    activity_validation_params: ActivityValidationParams,
+    activity: Vec<ActivityParser>,
+    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 ActivityValidationParams {
-        activity,
-        pk_node_map,
-        alias_node_map,
-    } = activity_validation_params;
-
     // Make all the activities identifiable by PK internally
     for act in activity.into_iter() {
         // We can only map aliases to nodes we control, so if either the source or destination alias