logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-02-17 11:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
hansieodendaal 2026-01-30 14:04:26 +02:00
parent 3a7fcf4f5b
commit cf74aedc2f
No known key found for this signature in database
GPG Key ID: 4B3B15868823687C
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing-framework/deployers/local/src/node_control/config.rs
View File

@ -8,7 +8,7 @@ use testing_framework_config::topology::configs::{
runtime::{build_general_config_for_node, build_initial_peers}, runtime::{build_general_config_for_node, build_initial_peers},
time::GeneralTimeConfig, time::GeneralTimeConfig,
}; };
use testing_framework_core::{ pub(crate) use testing_framework_core::{
scenario::{PeerSelection, StartNodeOptions}, scenario::{PeerSelection, StartNodeOptions},
topology::{ topology::{
config::{NodeConfigPatch, TopologyConfig}, config::{NodeConfigPatch, TopologyConfig},

14
testing-framework/deployers/local/src/node_control/mod.rs
View File

@ -219,7 +219,7 @@ impl LocalNodeManager {
for (idx, node) in nodes.into_iter().enumerate() { for (idx, node) in nodes.into_iter().enumerate() {
let name = Self::default_label(idx); 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(); let client = node.api().clone();
self.node_clients.add_node(client.clone()); self.node_clients.add_node(client.clone());
@ -427,7 +427,7 @@ impl LocalNodeManager {
&self, &self,
node_name: &str, node_name: &str,
network_port: u16, network_port: u16,
config: NodeConfig, config: RunConfig,
) -> Result<ApiClient, LocalNodeManagerError> { ) -> Result<ApiClient, LocalNodeManagerError> {
let node = Node::spawn(config, node_name) let node = Node::spawn(config, node_name)
.await .await
@ -449,9 +449,9 @@ impl LocalNodeManager {
fn build_node_config( fn build_node_config(
general_config: testing_framework_config::topology::configs::GeneralConfig, general_config: testing_framework_config::topology::configs::GeneralConfig,
descriptor_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, descriptor_patch: Option<&config::NodeConfigPatch>,
options_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, options_patch: Option<&config::NodeConfigPatch>,
) -> Result<NodeConfig, LocalNodeManagerError> { ) -> Result<RunConfig, LocalNodeManagerError> {
let mut config = create_node_config(general_config); let mut config = create_node_config(general_config);
config = apply_patch_if_needed(config, descriptor_patch)?; config = apply_patch_if_needed(config, descriptor_patch)?;
config = apply_patch_if_needed(config, options_patch)?; config = apply_patch_if_needed(config, options_patch)?;
@ -461,8 +461,8 @@ fn build_node_config(
fn apply_patch_if_needed( fn apply_patch_if_needed(
config: RunConfig, config: RunConfig,
patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, patch: Option<&config::NodeConfigPatch>,
) -> Result<NodeConfig, LocalNodeManagerError> { ) -> Result<RunConfig, LocalNodeManagerError> {
let Some(patch) = patch else { let Some(patch) = patch else {
return Ok(config); return Ok(config);
}; };