From 80be2eb2a11480dab69b2e6c40154fdc1391239d Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 24 Jul 2025 20:52:35 -0600 Subject: [PATCH 1/2] Pass swarm directory to new_local_swarm_with_release in updated diem lib --- smoke-tests/src/libra_smoke.rs | 7 +++++++ smoke-tests/tests/balance.rs | 2 +- smoke-tests/tests/meta.rs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/smoke-tests/src/libra_smoke.rs b/smoke-tests/src/libra_smoke.rs index 993a37192..a34543639 100644 --- a/smoke-tests/src/libra_smoke.rs +++ b/smoke-tests/src/libra_smoke.rs @@ -86,9 +86,16 @@ impl LibraSmoke { ); println!("Using diem-node binary at {:?}", &diem_path); + let mut swarm_path = TempPath::new(); + swarm_path.create_as_dir()?; + swarm_path.persist(); + println!("Creating swarm at {:?}", swarm_path.path()); + let swarm_dir = swarm_path.path().to_str().map(|s| s.to_string()); + let mut swarm = smoke_test_environment::new_local_swarm_with_release( count_vals.unwrap_or(1).into(), bundle, + swarm_dir ) .await; let chain_name = diff --git a/smoke-tests/tests/balance.rs b/smoke-tests/tests/balance.rs index e21f2706e..b2659cc9b 100644 --- a/smoke-tests/tests/balance.rs +++ b/smoke-tests/tests/balance.rs @@ -8,7 +8,7 @@ use smoke_test::smoke_test_environment::new_local_swarm_with_release; // let's check that this test environment produces same coins as expected in unit tests, and we have the tools to mint and test balances async fn sanity_balances() -> anyhow::Result<()> { let release = ReleaseTarget::Head.load_bundle().unwrap(); - let mut swarm = new_local_swarm_with_release(4, release).await; + let mut swarm = new_local_swarm_with_release(4, release, None).await; let v = swarm.validators_mut().next().unwrap(); let pri_key = v.account_private_key().as_ref().unwrap(); let address = v.peer_id().to_owned(); diff --git a/smoke-tests/tests/meta.rs b/smoke-tests/tests/meta.rs index 74d3de861..6a3d8e5fc 100644 --- a/smoke-tests/tests/meta.rs +++ b/smoke-tests/tests/meta.rs @@ -9,7 +9,7 @@ use smoke_test::smoke_test_environment::new_local_swarm_with_release; #[tokio::test(flavor = "multi_thread", worker_threads = 1)] async fn meta_can_start_swarm() { let release = ReleaseTarget::Head.load_bundle().unwrap(); - let mut swarm = new_local_swarm_with_release(1, release).await; + let mut swarm = new_local_swarm_with_release(1, release, None).await; let mut public_info = swarm.diem_public_info(); let payload = public_info From f4c2b43e9e960b98d5fa1148fa959ddcb8657b7b Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 24 Jul 2025 20:56:05 -0600 Subject: [PATCH 2/2] Fix lint error --- smoke-tests/src/libra_smoke.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smoke-tests/src/libra_smoke.rs b/smoke-tests/src/libra_smoke.rs index a34543639..2d462202b 100644 --- a/smoke-tests/src/libra_smoke.rs +++ b/smoke-tests/src/libra_smoke.rs @@ -95,7 +95,7 @@ impl LibraSmoke { let mut swarm = smoke_test_environment::new_local_swarm_with_release( count_vals.unwrap_or(1).into(), bundle, - swarm_dir + swarm_dir, ) .await; let chain_name =