diff --git a/examples/tests/manual_cluster.rs b/examples/tests/manual_cluster.rs index 290d3a3..208e95c 100644 --- a/examples/tests/manual_cluster.rs +++ b/examples/tests/manual_cluster.rs @@ -5,7 +5,7 @@ use testing_framework_core::{ scenario::{PeerSelection, StartNodeOptions}, topology::config::TopologyConfig, }; -use testing_framework_runner_local::ManualClusterGuard; +use testing_framework_runner_local::ManualCluster; use tokio::time::sleep; use tracing_subscriber::fmt::try_init; @@ -26,8 +26,8 @@ async fn manual_cluster_two_clusters_merge() -> Result<()> { // - `POL_PROOF_DEV_MODE=true` // - `RUST_LOG=info` (optional) let config = TopologyConfig::with_node_numbers(2, 0); - let cluster = ManualClusterGuard::from_config(config)?; - // Nodes are stopped automatically when the guard is dropped. + let cluster = ManualCluster::from_config(config)?; + // Nodes are stopped automatically when the cluster is dropped. println!("starting validator a"); diff --git a/testing-framework/deployers/local/src/lib.rs b/testing-framework/deployers/local/src/lib.rs index 1a7d15e..60d9d8e 100644 --- a/testing-framework/deployers/local/src/lib.rs +++ b/testing-framework/deployers/local/src/lib.rs @@ -2,6 +2,6 @@ mod manual; mod node_control; mod runner; -pub use manual::{ManualCluster, ManualClusterError, ManualClusterGuard}; +pub use manual::{ManualCluster, ManualClusterError}; pub use node_control::{LocalDynamicError, LocalDynamicNodes, LocalDynamicSeed}; pub use runner::{LocalDeployer, LocalDeployerError}; diff --git a/testing-framework/deployers/local/src/manual/mod.rs b/testing-framework/deployers/local/src/manual/mod.rs index 734c313..4d2d094 100644 --- a/testing-framework/deployers/local/src/manual/mod.rs +++ b/testing-framework/deployers/local/src/manual/mod.rs @@ -1,5 +1,3 @@ -use std::ops::Deref; - use testing_framework_core::{ nodes::ApiClient, scenario::{StartNodeOptions, StartedNode}, @@ -32,32 +30,6 @@ pub struct ManualCluster { nodes: LocalDynamicNodes, } -pub struct ManualClusterGuard { - cluster: ManualCluster, -} - -impl ManualClusterGuard { - pub fn from_config(config: TopologyConfig) -> Result { - Ok(Self { - cluster: ManualCluster::from_config(config)?, - }) - } -} - -impl Deref for ManualClusterGuard { - type Target = ManualCluster; - - fn deref(&self) -> &Self::Target { - &self.cluster - } -} - -impl Drop for ManualClusterGuard { - fn drop(&mut self) { - self.cluster.stop_all(); - } -} - impl ManualCluster { pub fn from_config(config: TopologyConfig) -> Result { let builder = TopologyBuilder::new(config); @@ -127,3 +99,9 @@ impl ManualCluster { ManualNetworkReadiness::new(nodes).wait().await } } + +impl Drop for ManualCluster { + fn drop(&mut self) { + self.stop_all(); + } +}