From 7a6db26fe139b5eaacca2bdbc8b816dcf40706cb Mon Sep 17 00:00:00 2001
From: andrussal <salumets.andrus@gmail.com>
Date: Wed, 10 Dec 2025 09:49:04 +0100
Subject: [PATCH] Remove cfgsync config facade; use direct modules

---
 testing-framework/runners/compose/src/deployer.rs | 5 ++++-
 testing-framework/tools/cfgsync/src/config.rs     | 8 --------
 testing-framework/tools/cfgsync/src/lib.rs        | 8 +++++++-
 testing-framework/tools/cfgsync/src/repo.rs       | 5 +----
 testing-framework/tools/cfgsync/src/server.rs     | 2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 testing-framework/tools/cfgsync/src/config.rs

diff --git a/testing-framework/runners/compose/src/deployer.rs b/testing-framework/runners/compose/src/deployer.rs
index 50c71eb..49d8839 100644
--- a/testing-framework/runners/compose/src/deployer.rs
+++ b/testing-framework/runners/compose/src/deployer.rs
@@ -288,7 +288,10 @@ impl CleanupGuard for ComposeCleanupGuard {
 mod tests {
     use std::{collections::HashMap, net::Ipv4Addr};
 
-    use cfgsync::config::{Host, PortOverrides, create_node_configs};
+    use cfgsync::{
+        config::builder::create_node_configs,
+        host::{Host, PortOverrides},
+    };
     use groth16::Fr;
     use nomos_core::{
         mantle::{GenesisTx as GenesisTxTrait, ledger::NoteId},
diff --git a/testing-framework/tools/cfgsync/src/config.rs b/testing-framework/tools/cfgsync/src/config.rs
deleted file mode 100644
index 67ce4f6..0000000
--- a/testing-framework/tools/cfgsync/src/config.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub use crate::host::{Host, HostKind, PortOverrides};
-
-mod builder;
-pub use builder::create_node_configs;
-pub mod kms;
-pub mod providers;
-pub mod tracing;
-pub mod validation;
diff --git a/testing-framework/tools/cfgsync/src/lib.rs b/testing-framework/tools/cfgsync/src/lib.rs
index cd46000..2628d64 100644
--- a/testing-framework/tools/cfgsync/src/lib.rs
+++ b/testing-framework/tools/cfgsync/src/lib.rs
@@ -1,6 +1,12 @@
 pub mod client;
-pub mod config;
 pub mod host;
+pub mod config {
+    pub mod builder;
+    pub mod kms;
+    pub mod providers;
+    pub mod tracing;
+    pub mod validation;
+}
 pub mod network;
 pub mod repo;
 pub mod server;
diff --git a/testing-framework/tools/cfgsync/src/repo.rs b/testing-framework/tools/cfgsync/src/repo.rs
index 3b9d4ed..83d83fb 100644
--- a/testing-framework/tools/cfgsync/src/repo.rs
+++ b/testing-framework/tools/cfgsync/src/repo.rs
@@ -10,10 +10,7 @@ use testing_framework_config::topology::configs::{
 };
 use tokio::{sync::oneshot::Sender, time::timeout};
 
-use crate::{
-    config::{Host, create_node_configs},
-    server::CfgSyncConfig,
-};
+use crate::{config::builder::create_node_configs, host::Host, server::CfgSyncConfig};
 
 pub enum RepoResponse {
     Config(Box<GeneralConfig>),
diff --git a/testing-framework/tools/cfgsync/src/server.rs b/testing-framework/tools/cfgsync/src/server.rs
index fe91dc3..e09aa91 100644
--- a/testing-framework/tools/cfgsync/src/server.rs
+++ b/testing-framework/tools/cfgsync/src/server.rs
@@ -17,7 +17,7 @@ use testing_framework_config::{
 use tokio::sync::oneshot::channel;
 
 use crate::{
-    config::{Host, PortOverrides},
+    host::{Host, PortOverrides},
     repo::{ConfigRepo, RepoResponse},
 };