Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sim-cli/src/parsing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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() {
Expand Down