From 5b2262b6388f71bd520ca3d761ba006804b626b2 Mon Sep 17 00:00:00 2001 From: zancas Date: Fri, 8 Mar 2024 13:11:38 -0700 Subject: [PATCH] mv use to only use when not ci_skip --- .../tests/network_interruption_tests.rs | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/darkside-tests/tests/network_interruption_tests.rs b/darkside-tests/tests/network_interruption_tests.rs index e3029e9ffc..7e506056f5 100644 --- a/darkside-tests/tests/network_interruption_tests.rs +++ b/darkside-tests/tests/network_interruption_tests.rs @@ -2,23 +2,18 @@ use std::{ collections::HashMap, sync::{ atomic::{AtomicBool, Ordering}, - Arc, Mutex, + Arc, }, time::Duration, }; -use darkside_tests::{ - constants::DARKSIDE_SEED, - utils::{ - create_chainbuild_file, load_chainbuild_file, prepare_darksidewalletd, - scenarios::{DarksideScenario, DarksideSender}, - DarksideHandler, - }, +use darkside_tests::utils::{ + create_chainbuild_file, load_chainbuild_file, prepare_darksidewalletd, + scenarios::{DarksideScenario, DarksideSender}, }; use json::JsonValue; use tokio::time::sleep; -use zingo_testutils::{scenarios::setup::ClientBuilder, start_proxy_and_connect_lightclient}; -use zingoconfig::RegtestNetwork; +use zingo_testutils::start_proxy_and_connect_lightclient; use zingolib::{ get_base_address, lightclient::PoolBalances, @@ -29,6 +24,10 @@ use zingolib::{ #[tokio::test] #[cfg(not(feature = "ci_skip"))] async fn interrupt_initial_tree_fetch() { + use darkside_tests::constants::DARKSIDE_SEED; + use darkside_tests::utils::DarksideHandler; + use zingo_testutils::scenarios::setup::ClientBuilder; + use zingoconfig::RegtestNetwork; let darkside_handler = DarksideHandler::new(None); let server_id = zingoconfig::construct_lightwalletd_uri(Some(format!( @@ -45,7 +44,7 @@ async fn interrupt_initial_tree_fetch() { let mut cond_log = HashMap::<&'static str, Box) + Send + Sync + 'static>>::new(); let (sender, receiver) = std::sync::mpsc::channel(); - let sender = Arc::new(Mutex::new(sender)); + let sender = Arc::new(std::sync::Mutex::new(sender)); cond_log.insert( "get_tree_state", Box::new(move |_online| { @@ -63,7 +62,7 @@ async fn interrupt_initial_tree_fetch() { let (proxy_handle, _proxy_status) = start_proxy_and_connect_lightclient(&light_client, cond_log); - let receiver = Arc::new(Mutex::new(receiver)); + let receiver = Arc::new(std::sync::Mutex::new(receiver)); println!("made receiver"); std::thread::spawn(move || { receiver.lock().unwrap().recv().unwrap();