From cf74aedc2fd7b284ef0f43d84b3cc75abda7a24e Mon Sep 17 00:00:00 2001
From: hansieodendaal <hansie.odendaal@gmail.com>
Date: Fri, 30 Jan 2026 14:04:26 +0200
Subject: [PATCH] merge

---
 .../deployers/local/src/node_control/config.rs     |  2 +-
 .../deployers/local/src/node_control/mod.rs        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testing-framework/deployers/local/src/node_control/config.rs b/testing-framework/deployers/local/src/node_control/config.rs
index cbd083c..8fe9aec 100644
--- a/testing-framework/deployers/local/src/node_control/config.rs
+++ b/testing-framework/deployers/local/src/node_control/config.rs
@@ -8,7 +8,7 @@ use testing_framework_config::topology::configs::{
     runtime::{build_general_config_for_node, build_initial_peers},
     time::GeneralTimeConfig,
 };
-use testing_framework_core::{
+pub(crate) use testing_framework_core::{
     scenario::{PeerSelection, StartNodeOptions},
     topology::{
         config::{NodeConfigPatch, TopologyConfig},
diff --git a/testing-framework/deployers/local/src/node_control/mod.rs b/testing-framework/deployers/local/src/node_control/mod.rs
index 80512cc..b3b9846 100644
--- a/testing-framework/deployers/local/src/node_control/mod.rs
+++ b/testing-framework/deployers/local/src/node_control/mod.rs
@@ -219,7 +219,7 @@ impl LocalNodeManager {
 
         for (idx, node) in nodes.into_iter().enumerate() {
             let name = Self::default_label(idx);
-            let port = node.config().network.backend.swarm.port;
+            let port = node.config().user.network.backend.swarm.port;
             let client = node.api().clone();
 
             self.node_clients.add_node(client.clone());
@@ -427,7 +427,7 @@ impl LocalNodeManager {
         &self,
         node_name: &str,
         network_port: u16,
-        config: NodeConfig,
+        config: RunConfig,
     ) -> Result<ApiClient, LocalNodeManagerError> {
         let node = Node::spawn(config, node_name)
             .await
@@ -449,9 +449,9 @@ impl LocalNodeManager {
 
 fn build_node_config(
     general_config: testing_framework_config::topology::configs::GeneralConfig,
-    descriptor_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
-    options_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
-) -> Result<NodeConfig, LocalNodeManagerError> {
+    descriptor_patch: Option<&config::NodeConfigPatch>,
+    options_patch: Option<&config::NodeConfigPatch>,
+) -> Result<RunConfig, LocalNodeManagerError> {
     let mut config = create_node_config(general_config);
     config = apply_patch_if_needed(config, descriptor_patch)?;
     config = apply_patch_if_needed(config, options_patch)?;
@@ -461,8 +461,8 @@ fn build_node_config(
 
 fn apply_patch_if_needed(
     config: RunConfig,
-    patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
-) -> Result<NodeConfig, LocalNodeManagerError> {
+    patch: Option<&config::NodeConfigPatch>,
+) -> Result<RunConfig, LocalNodeManagerError> {
     let Some(patch) = patch else {
         return Ok(config);
     };