From c2ac7f4dc0bb635cd9203987b5438e946e005e1b Mon Sep 17 00:00:00 2001 From: andrussal Date: Tue, 16 Dec 2025 01:13:49 +0100 Subject: [PATCH] refactor(cfgsync): clarify readiness mapping --- testing-framework/tools/cfgsync/src/repo.rs | 5 ++++- testing-framework/tools/cfgsync/src/server.rs | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/testing-framework/tools/cfgsync/src/repo.rs b/testing-framework/tools/cfgsync/src/repo.rs index ceeb936..0398c95 100644 --- a/testing-framework/tools/cfgsync/src/repo.rs +++ b/testing-framework/tools/cfgsync/src/repo.rs @@ -98,7 +98,10 @@ impl ConfigRepo { async fn run(&self) { let timeout_duration = self.timeout_duration; - if timeout(timeout_duration, self.wait_for_hosts()).await == Ok(()) { + if timeout(timeout_duration, self.wait_for_hosts()) + .await + .is_ok() + { println!("All hosts have announced their IPs"); let mut waiting_hosts = self.waiting_hosts.lock().unwrap(); diff --git a/testing-framework/tools/cfgsync/src/server.rs b/testing-framework/tools/cfgsync/src/server.rs index 72697ff..caba070 100644 --- a/testing-framework/tools/cfgsync/src/server.rs +++ b/testing-framework/tools/cfgsync/src/server.rs @@ -259,19 +259,28 @@ fn override_api_ports(config: &mut Value, ports: &PortOverrides) { } fn inject_da_assignations(config: &mut Value, membership: &nomos_node::NomosDaMembership) { + struct SubnetAssignment { + subnet_id: String, + peers: Vec, + } + fn convert_subnet_to_assignment( subnet_id: impl ToString, members: impl IntoIterator, - ) -> (String, Vec) { - let peer_strings: Vec = members.into_iter().map(|peer| peer.to_string()).collect(); + ) -> SubnetAssignment { + let peers = members.into_iter().map(|peer| peer.to_string()).collect(); - (subnet_id.to_string(), peer_strings) + SubnetAssignment { + subnet_id: subnet_id.to_string(), + peers, + } } let subnetworks = membership.subnetworks(); let assignations: std::collections::HashMap> = subnetworks .into_iter() .map(|(subnet_id, members)| convert_subnet_to_assignment(subnet_id, members)) + .map(|assignment| (assignment.subnet_id, assignment.peers)) .collect(); if let Some(membership) = config.pointer_mut("/da_network/membership") {