From a2705aa6f029e27d2fc9a9554322364941e73c2e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Mar 2025 12:44:44 +0100 Subject: [PATCH] sim-cli/refactor: do not call add_node_to_maps in validate_activities. --- sim-cli/src/parsing.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sim-cli/src/parsing.rs b/sim-cli/src/parsing.rs index bfa05449..84696ba7 100755 --- a/sim-cli/src/parsing.rs +++ b/sim-cli/src/parsing.rs @@ -169,7 +169,10 @@ pub async fn create_simulation(cli: &Cli) -> Result { )) }; - 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, - nodes: &HashMap, + pk_node_map: HashMap, + alias_node_map: HashMap, get_node_info: impl AsyncFn(&PublicKey) -> Result, ) -> Result, 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() {