From 3f8beabae821434b3779902c2e1520d51c5a40d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Tue, 2 Apr 2024 18:08:05 +0200 Subject: [PATCH 01/16] fixed tests failing on Bert's computer --- node/src/daemon/setup_reporter.rs | 12 +++++++---- .../node_configurator_standard.rs | 20 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index d882ee773..b4fbdcef5 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -1237,8 +1237,10 @@ mod tests { use masq_lib::utils::{add_chain_specific_directory, AutomapProtocol}; use std::cell::RefCell; use std::convert::TryFrom; + use std::env; #[cfg(not(target_os = "windows"))] use std::default::Default; + use std::env::current_dir; use std::fs::{create_dir_all, File}; use std::io::Write; use std::net::IpAddr; @@ -2053,12 +2055,14 @@ mod tests { "get_modified_setup_tilde_in_data_directory", ); let data_dir = base_dir.join("data_dir"); + env::set_var("HOME", current_dir().unwrap().join(base_dir.clone()).to_string_lossy().to_string()); std::fs::create_dir_all(home_dir().expect("expect home dir").join("masqhome")).unwrap(); + let config_file_path = home_dir() + .expect("expect home dir") + .join("masqhome") + .join("config.toml"); let mut config_file = File::create( - home_dir() - .expect("expect home dir") - .join("masqhome") - .join("config.toml"), + &config_file_path ) .unwrap(); config_file diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index bb930a9d1..213aec75f 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,7 +376,6 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; - use dirs::home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -391,7 +390,7 @@ mod tests { use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; - use std::vec; + use std::{env, vec}; #[test] fn node_configurator_standard_unprivileged_uses_parse_args_configurator_dao_real() { @@ -1071,14 +1070,21 @@ mod tests { } #[test] - fn server_initializer_collected_params_handle_tilde_in_path_config_file_from_commandline_and_real_user_from_config_file( + fn tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file( ) { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); - let home_dir = home_dir().expect("expectexd home dir"); - let data_dir = &home_dir.join("masqhome"); - let _create_data_dir = create_dir_all(data_dir); + //let home_dir = home_dir().expect("expectexd home dir"); + //let data_dir = &home_dir.join("masqhome"); + let base_dir = ensure_node_home_directory_exists( + "node_configurator_standard", + "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", + ); + let home_dir = base_dir.clone(); + let data_dir = base_dir.join("masqhome"); + env::set_var("HOME", current_dir().unwrap().join(base_dir.clone()).to_string_lossy().to_string()); + let _create_data_dir = create_dir_all(&data_dir); let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); fill_up_config_file(config_file_relative); let env_vec_array = vec![ @@ -1121,7 +1127,7 @@ mod tests { } assert_eq!( value_m!(multiconfig, "config-file", String).unwrap(), - data_dir + current_dir().unwrap().join(data_dir) .join(PathBuf::from("config.toml")) .to_string_lossy() .to_string() From f9ec951a9c475dd15b3458cf79aed1bde4fafd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Tue, 2 Apr 2024 19:11:35 +0200 Subject: [PATCH 02/16] formatting --- node/src/daemon/setup_reporter.rs | 16 ++++++++++------ .../node_configurator_standard.rs | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index b4fbdcef5..c119bb10b 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -1237,9 +1237,9 @@ mod tests { use masq_lib::utils::{add_chain_specific_directory, AutomapProtocol}; use std::cell::RefCell; use std::convert::TryFrom; - use std::env; #[cfg(not(target_os = "windows"))] use std::default::Default; + use std::env; use std::env::current_dir; use std::fs::{create_dir_all, File}; use std::io::Write; @@ -2055,16 +2055,20 @@ mod tests { "get_modified_setup_tilde_in_data_directory", ); let data_dir = base_dir.join("data_dir"); - env::set_var("HOME", current_dir().unwrap().join(base_dir.clone()).to_string_lossy().to_string()); + env::set_var( + "HOME", + current_dir() + .unwrap() + .join(base_dir.clone()) + .to_string_lossy() + .to_string(), + ); std::fs::create_dir_all(home_dir().expect("expect home dir").join("masqhome")).unwrap(); let config_file_path = home_dir() .expect("expect home dir") .join("masqhome") .join("config.toml"); - let mut config_file = File::create( - &config_file_path - ) - .unwrap(); + let mut config_file = File::create(&config_file_path).unwrap(); config_file .write_all(b"blockchain-service-url = \"https://www.mainnet.com\"\n") .unwrap(); diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 213aec75f..3068e0d5e 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -1070,8 +1070,7 @@ mod tests { } #[test] - fn tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file( - ) { + fn tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file() { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); @@ -1083,7 +1082,14 @@ mod tests { ); let home_dir = base_dir.clone(); let data_dir = base_dir.join("masqhome"); - env::set_var("HOME", current_dir().unwrap().join(base_dir.clone()).to_string_lossy().to_string()); + env::set_var( + "HOME", + current_dir() + .unwrap() + .join(base_dir.clone()) + .to_string_lossy() + .to_string(), + ); let _create_data_dir = create_dir_all(&data_dir); let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); fill_up_config_file(config_file_relative); @@ -1127,7 +1133,9 @@ mod tests { } assert_eq!( value_m!(multiconfig, "config-file", String).unwrap(), - current_dir().unwrap().join(data_dir) + current_dir() + .unwrap() + .join(data_dir) .join(PathBuf::from("config.toml")) .to_string_lossy() .to_string() From acbbb0e5da9341b33479d99681d12c97755e86d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Tue, 2 Apr 2024 19:54:20 +0200 Subject: [PATCH 03/16] remove commented out code --- node/src/node_configurator/node_configurator_standard.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 3068e0d5e..1c4818fea 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -1074,8 +1074,6 @@ mod tests { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); - //let home_dir = home_dir().expect("expectexd home dir"); - //let data_dir = &home_dir.join("masqhome"); let base_dir = ensure_node_home_directory_exists( "node_configurator_standard", "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", From a6ab82e4e71d6d3fa9b5a182b2ef625922dc4872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Tue, 2 Apr 2024 20:15:31 +0200 Subject: [PATCH 04/16] change .clone() to reference --- node/src/daemon/setup_reporter.rs | 2 +- node/src/node_configurator/node_configurator_standard.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index c119bb10b..0eeb70cce 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -2059,7 +2059,7 @@ mod tests { "HOME", current_dir() .unwrap() - .join(base_dir.clone()) + .join(&base_dir) .to_string_lossy() .to_string(), ); diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 1c4818fea..7e0f9b15a 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -1084,7 +1084,7 @@ mod tests { "HOME", current_dir() .unwrap() - .join(base_dir.clone()) + .join(&base_dir) .to_string_lossy() .to_string(), ); From f5fab1da12224b6f8f7726a5bf8ea83b9073ee11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Tue, 2 Apr 2024 23:08:54 +0200 Subject: [PATCH 05/16] fixed test for windows in actions: tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file --- .../node_configurator/node_configurator_standard.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 7e0f9b15a..31f2d3f7d 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,6 +376,7 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; + use dirs::home_dir as dirs_home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -1129,6 +1130,7 @@ mod tests { "9999:9999:booga" ); } + #[cfg(not(target_os = "windows"))] assert_eq!( value_m!(multiconfig, "config-file", String).unwrap(), current_dir() @@ -1138,6 +1140,16 @@ mod tests { .to_string_lossy() .to_string() ); + #[cfg(target_os = "windows")] + assert_eq!( + value_m!(multiconfig, "config-file", String).unwrap(), + dirs_home_dir() + .unwrap() + .join("masqhome") + .join(PathBuf::from("config.toml")) + .to_string_lossy() + .to_string() + ); assert_eq!( value_m!(multiconfig, "blockchain-service-url", String).unwrap(), "https://www.mainnet1.com" From ab83b30655ef890cfa2e8cb912a6173bc0f4c4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 3 Apr 2024 12:00:02 +0200 Subject: [PATCH 06/16] target_os for dirs crate used only on windows test --- node/src/node_configurator/node_configurator_standard.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 31f2d3f7d..e00d31926 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,7 +376,6 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; - use dirs::home_dir as dirs_home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -392,6 +391,8 @@ mod tests { use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; use std::{env, vec}; + #[cfg(target_os = "windows")] + use dirs::home_dir as dirs_home_dir; #[test] fn node_configurator_standard_unprivileged_uses_parse_args_configurator_dao_real() { From ce8a7cce693654d961a54286ea224522eeefbeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 3 Apr 2024 12:52:05 +0200 Subject: [PATCH 07/16] implementing Bert's review comments - change DirsWrapperMock to DirsWrapperReal and simplifying home_dir creation --- node/src/daemon/setup_reporter.rs | 6 +----- .../node_configurator_standard.rs | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index 0eeb70cce..8c7609b5f 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -2090,11 +2090,7 @@ mod tests { .collect_vec(); let expected_config_file_data = "https://www.mainnet.com"; - let dirs_wrapper = Box::new( - DirsWrapperMock::new() - .data_dir_result(Some(data_dir)) - .home_dir_result(Some(base_dir)), - ); + let dirs_wrapper = Box::new(DirsWrapperReal {}); let subject = SetupReporterReal::new(dirs_wrapper); let result = subject diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index e00d31926..1dd1163af 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,6 +376,8 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; + #[cfg(target_os = "windows")] + use dirs::home_dir as dirs_home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -391,8 +393,6 @@ mod tests { use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; use std::{env, vec}; - #[cfg(target_os = "windows")] - use dirs::home_dir as dirs_home_dir; #[test] fn node_configurator_standard_unprivileged_uses_parse_args_configurator_dao_real() { @@ -1076,17 +1076,16 @@ mod tests { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); - let base_dir = ensure_node_home_directory_exists( + let home_dir = ensure_node_home_directory_exists( "node_configurator_standard", "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", ); - let home_dir = base_dir.clone(); - let data_dir = base_dir.join("masqhome"); + let data_dir = home_dir.join("masqhome"); env::set_var( "HOME", current_dir() .unwrap() - .join(&base_dir) + .join(&home_dir) .to_string_lossy() .to_string(), ); @@ -1113,16 +1112,18 @@ mod tests { .param("--config-file", "~\\masqhome\\config.toml") .param("--data-directory", "~\\masqhome"); let args_vec: Vec = args.into(); - let dir_wrapper = DirsWrapperMock::new() - .home_dir_result(Some(home_dir.to_path_buf())) - .data_dir_result(Some(data_dir.to_path_buf())); + let dir_wrapper = DirsWrapperReal {}; let result = server_initializer_collected_params(&dir_wrapper, args_vec.as_slice()); let multiconfig = result.unwrap(); assert_eq!( value_m!(multiconfig, "data-directory", String).unwrap(), - data_dir.to_string_lossy().to_string() + current_dir() + .unwrap() + .join(&data_dir) + .to_string_lossy() + .to_string() ); #[cfg(not(target_os = "windows"))] { From c3566a6a227c62872ef5a234d2af6408f76af5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 3 Apr 2024 14:11:50 +0200 Subject: [PATCH 08/16] fixing windows data-directory assertion in test tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file --- .../node_configurator_standard.rs | 63 +++++++++++-------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 1dd1163af..4f907e903 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -1117,41 +1117,50 @@ mod tests { let result = server_initializer_collected_params(&dir_wrapper, args_vec.as_slice()); let multiconfig = result.unwrap(); - assert_eq!( - value_m!(multiconfig, "data-directory", String).unwrap(), - current_dir() - .unwrap() - .join(&data_dir) - .to_string_lossy() - .to_string() - ); #[cfg(not(target_os = "windows"))] { + assert_eq!( + value_m!(multiconfig, "data-directory", String).unwrap(), + current_dir() + .unwrap() + .join(&data_dir) + .to_string_lossy() + .to_string() + ); assert_eq!( value_m!(multiconfig, "real-user", String).unwrap(), "9999:9999:booga" ); + assert_eq!( + value_m!(multiconfig, "config-file", String).unwrap(), + current_dir() + .unwrap() + .join(data_dir) + .join(PathBuf::from("config.toml")) + .to_string_lossy() + .to_string() + ); } - #[cfg(not(target_os = "windows"))] - assert_eq!( - value_m!(multiconfig, "config-file", String).unwrap(), - current_dir() - .unwrap() - .join(data_dir) - .join(PathBuf::from("config.toml")) - .to_string_lossy() - .to_string() - ); #[cfg(target_os = "windows")] - assert_eq!( - value_m!(multiconfig, "config-file", String).unwrap(), - dirs_home_dir() - .unwrap() - .join("masqhome") - .join(PathBuf::from("config.toml")) - .to_string_lossy() - .to_string() - ); + { + assert_eq!( + value_m!(multiconfig, "data-directory", String).unwrap(), + dirs_home_dir() + .unwrap() + .join(&data_dir) + .to_string_lossy() + .to_string() + ); + assert_eq!( + value_m!(multiconfig, "config-file", String).unwrap(), + dirs_home_dir() + .unwrap() + .join("masqhome") + .join(PathBuf::from("config.toml")) + .to_string_lossy() + .to_string() + ); + } assert_eq!( value_m!(multiconfig, "blockchain-service-url", String).unwrap(), "https://www.mainnet1.com" From 08064675aa5573b74edea1a2d7194c9f081fd52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 3 Apr 2024 15:50:54 +0200 Subject: [PATCH 09/16] fixing home dir assertion for windows --- node/src/node_configurator/node_configurator_standard.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 4f907e903..37a3d3c95 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,7 +376,7 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; - #[cfg(target_os = "windows")] + //#[cfg(target_os = "windows")] use dirs::home_dir as dirs_home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; @@ -1147,7 +1147,7 @@ mod tests { value_m!(multiconfig, "data-directory", String).unwrap(), dirs_home_dir() .unwrap() - .join(&data_dir) + .join("masqhome") .to_string_lossy() .to_string() ); From 35733e033c67c1ae020d33b637669eab4ee607d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 3 Apr 2024 16:02:49 +0200 Subject: [PATCH 10/16] add condition to use of dirs crate only for windows --- node/src/node_configurator/node_configurator_standard.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 37a3d3c95..dfdae1f3a 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -376,7 +376,7 @@ mod tests { make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; - //#[cfg(target_os = "windows")] + #[cfg(target_os = "windows")] use dirs::home_dir as dirs_home_dir; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; From bd1b844fa8812f9e44ef5417e33035a0f3503236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Thu, 4 Apr 2024 10:59:18 +0200 Subject: [PATCH 11/16] fixing config toml for windows test tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file --- .../node_configurator_standard.rs | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index dfdae1f3a..05861f6f3 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -1089,9 +1089,25 @@ mod tests { .to_string_lossy() .to_string(), ); - let _create_data_dir = create_dir_all(&data_dir); - let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); - fill_up_config_file(config_file_relative); + #[cfg(target_os = "windows")] + { + let masqhome = dirs_home_dir() + .unwrap() + .join("masqhome"); + create_dir_all(&masqhome.to_string_lossy().to_string()); + let config_file_path = masqhome + .join("config.toml") + .to_string_lossy() + .to_string(); + let config_file_relative = File::create(config_file_path).unwrap(); + crate::node_configurator::node_configurator_standard::tests::fill_up_config_file(config_file_relative); + } + #[cfg(not(target_os = "windows"))] + { + create_dir_all(&data_dir); + let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); + fill_up_config_file(config_file_relative); + } let env_vec_array = vec![ ("MASQ_BLOCKCHAIN_SERVICE_URL", "https://www.mainnet2.com"), #[cfg(not(target_os = "windows"))] From b04a55016d591ee69a98d55c5819e7bedf641ea8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Apr 2024 14:43:10 -0700 Subject: [PATCH 12/16] fixed windows test --- .../node_configurator_standard.rs | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 05861f6f3..8ad28944d 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -392,7 +392,9 @@ mod tests { use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; - use std::{env, vec}; + use std::vec; + #[cfg(not(target_os = "windows"))] + use std::env; #[test] fn node_configurator_standard_unprivileged_uses_parse_args_configurator_dao_real() { @@ -1076,25 +1078,31 @@ mod tests { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); - let home_dir = ensure_node_home_directory_exists( - "node_configurator_standard", - "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", - ); - let data_dir = home_dir.join("masqhome"); - env::set_var( - "HOME", - current_dir() - .unwrap() - .join(&home_dir) - .to_string_lossy() - .to_string(), - ); + #[cfg(not(target_os = "windows"))] + { + let home_dir = ensure_node_home_directory_exists( + "node_configurator_standard", + "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", + ); + let data_dir = home_dir.join("masqhome"); + env::set_var( + "HOME", + current_dir() + .unwrap() + .join(&home_dir) + .to_string_lossy() + .to_string(), + ); + let _dir = create_dir_all(&data_dir); + let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); + fill_up_config_file(config_file_relative); + } #[cfg(target_os = "windows")] { let masqhome = dirs_home_dir() .unwrap() .join("masqhome"); - create_dir_all(&masqhome.to_string_lossy().to_string()); + let _dir = create_dir_all(&masqhome.to_string_lossy().to_string()); let config_file_path = masqhome .join("config.toml") .to_string_lossy() @@ -1102,12 +1110,6 @@ mod tests { let config_file_relative = File::create(config_file_path).unwrap(); crate::node_configurator::node_configurator_standard::tests::fill_up_config_file(config_file_relative); } - #[cfg(not(target_os = "windows"))] - { - create_dir_all(&data_dir); - let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); - fill_up_config_file(config_file_relative); - } let env_vec_array = vec![ ("MASQ_BLOCKCHAIN_SERVICE_URL", "https://www.mainnet2.com"), #[cfg(not(target_os = "windows"))] From e709bb0885c22cb5cd63db9aab1ef0784d78f7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Thu, 4 Apr 2024 18:09:54 +0200 Subject: [PATCH 13/16] formatting --- .../node_configurator_standard.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index 8ad28944d..aec8a41db 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -387,14 +387,14 @@ mod tests { use masq_lib::utils::running_test; use rustc_hex::FromHex; use std::convert::TryFrom; + #[cfg(not(target_os = "windows"))] + use std::env; use std::env::current_dir; use std::fs::{canonicalize, create_dir_all, File}; use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; use std::vec; - #[cfg(not(target_os = "windows"))] - use std::env; #[test] fn node_configurator_standard_unprivileged_uses_parse_args_configurator_dao_real() { @@ -1099,16 +1099,13 @@ mod tests { } #[cfg(target_os = "windows")] { - let masqhome = dirs_home_dir() - .unwrap() - .join("masqhome"); + let masqhome = dirs_home_dir().unwrap().join("masqhome"); let _dir = create_dir_all(&masqhome.to_string_lossy().to_string()); - let config_file_path = masqhome - .join("config.toml") - .to_string_lossy() - .to_string(); + let config_file_path = masqhome.join("config.toml").to_string_lossy().to_string(); let config_file_relative = File::create(config_file_path).unwrap(); - crate::node_configurator::node_configurator_standard::tests::fill_up_config_file(config_file_relative); + crate::node_configurator::node_configurator_standard::tests::fill_up_config_file( + config_file_relative, + ); } let env_vec_array = vec![ ("MASQ_BLOCKCHAIN_SERVICE_URL", "https://www.mainnet2.com"), From 79a2ce0a70d9cbed4fedbb94341156b862e13c34 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Apr 2024 04:29:30 -0700 Subject: [PATCH 14/16] fixed tilde tests for windows --- node/src/daemon/setup_reporter.rs | 26 ++--- node/src/node_configurator/mod.rs | 13 ++- .../node_configurator_standard.rs | 108 +++++------------- node/src/test_utils/mod.rs | 35 +++++- 4 files changed, 81 insertions(+), 101 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index 8c7609b5f..779797a65 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -1224,9 +1224,8 @@ mod tests { make_persistent_config_real_with_config_dao_null, make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; - use crate::test_utils::{assert_string_contains, rate_pack}; + use crate::test_utils::{assert_string_contains, get_project_root, rate_pack}; use core::option::Option; - use dirs::home_dir; use masq_lib::blockchains::chains::Chain as Blockchain; use masq_lib::blockchains::chains::Chain::PolyMumbai; use masq_lib::constants::{DEFAULT_CHAIN, DEFAULT_GAS_PRICE}; @@ -2055,19 +2054,8 @@ mod tests { "get_modified_setup_tilde_in_data_directory", ); let data_dir = base_dir.join("data_dir"); - env::set_var( - "HOME", - current_dir() - .unwrap() - .join(&base_dir) - .to_string_lossy() - .to_string(), - ); - std::fs::create_dir_all(home_dir().expect("expect home dir").join("masqhome")).unwrap(); - let config_file_path = home_dir() - .expect("expect home dir") - .join("masqhome") - .join("config.toml"); + std::fs::create_dir_all(base_dir.join("masqhome")).unwrap(); + let config_file_path = base_dir.join("masqhome").join("config.toml"); let mut config_file = File::create(&config_file_path).unwrap(); config_file .write_all(b"blockchain-service-url = \"https://www.mainnet.com\"\n") @@ -2090,8 +2078,12 @@ mod tests { .collect_vec(); let expected_config_file_data = "https://www.mainnet.com"; - let dirs_wrapper = Box::new(DirsWrapperReal {}); - let subject = SetupReporterReal::new(dirs_wrapper); + //let dirs_wrapper = Box::new(DirsWrapperReal {}); + let dirs_wrapper = DirsWrapperMock { + data_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&data_dir))), + home_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&base_dir))), + }; + let subject = SetupReporterReal::new(Box::new(dirs_wrapper)); let result = subject .get_modified_setup(existing_setup, incoming_setup) diff --git a/node/src/node_configurator/mod.rs b/node/src/node_configurator/mod.rs index a45a2969a..c64578e0a 100644 --- a/node/src/node_configurator/mod.rs +++ b/node/src/node_configurator/mod.rs @@ -119,15 +119,16 @@ fn get_data_directory_from_mc( } } -fn replace_tilde(config_path: PathBuf) -> PathBuf { +fn replace_tilde(config_path: PathBuf, dirs_wrapper: &dyn DirsWrapper) -> PathBuf { match config_path.starts_with("~") { true => PathBuf::from( config_path.display().to_string().replacen( '~', - home_dir() - .expect("expected users home_dir") + dirs_wrapper + .home_dir() + .expect("expected users home dir") .to_str() - .expect("expected str home_dir"), + .expect("expected home dir"), 1, ), ), @@ -166,12 +167,13 @@ fn get_config_file_from_mc( multi_config: &MultiConfig, data_directory: &Path, data_directory_def: bool, + dirs_wrapper: &dyn DirsWrapper, ) -> FieldPair { let mut panic: bool = false; let config_file = value_m!(multi_config, "config-file", PathBuf); match config_file { Some(config_path) => { - let config_path = replace_tilde(config_path); + let config_path = replace_tilde(config_path, dirs_wrapper); let config_path = replace_dots(config_path); let config_path = replace_relative_path(config_path, data_directory_def, data_directory, &mut panic); @@ -216,6 +218,7 @@ fn config_file_data_dir_real_user_chain_from_mc( &multi_config, &initialization_data.data_directory.item, initialization_data.data_directory.user_specified, + dirs_wrapper, ); initialization_data } diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index aec8a41db..e96ba5af6 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -375,9 +375,7 @@ mod tests { use crate::test_utils::unshared_test_utils::{ make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; - use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; - #[cfg(target_os = "windows")] - use dirs::home_dir as dirs_home_dir; + use crate::test_utils::{assert_string_contains, get_project_root, main_cryptde, ArgsBuilder}; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -387,8 +385,6 @@ mod tests { use masq_lib::utils::running_test; use rustc_hex::FromHex; use std::convert::TryFrom; - #[cfg(not(target_os = "windows"))] - use std::env; use std::env::current_dir; use std::fs::{canonicalize, create_dir_all, File}; use std::io::Write; @@ -1078,35 +1074,14 @@ mod tests { running_test(); let _guard = EnvironmentGuard::new(); let _clap_guard = ClapGuard::new(); - #[cfg(not(target_os = "windows"))] - { - let home_dir = ensure_node_home_directory_exists( - "node_configurator_standard", - "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", - ); - let data_dir = home_dir.join("masqhome"); - env::set_var( - "HOME", - current_dir() - .unwrap() - .join(&home_dir) - .to_string_lossy() - .to_string(), - ); - let _dir = create_dir_all(&data_dir); - let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); - fill_up_config_file(config_file_relative); - } - #[cfg(target_os = "windows")] - { - let masqhome = dirs_home_dir().unwrap().join("masqhome"); - let _dir = create_dir_all(&masqhome.to_string_lossy().to_string()); - let config_file_path = masqhome.join("config.toml").to_string_lossy().to_string(); - let config_file_relative = File::create(config_file_path).unwrap(); - crate::node_configurator::node_configurator_standard::tests::fill_up_config_file( - config_file_relative, - ); - } + let home_dir = ensure_node_home_directory_exists( + "node_configurator_standard", + "tilde_in_config_file_path_from_commandline_and_args_uploaded_from_config_file", + ); + let data_dir = home_dir.join("masqhome"); + let _dir = create_dir_all(&data_dir); + let config_file_relative = File::create(data_dir.join("config.toml")).unwrap(); + fill_up_config_file(config_file_relative); let env_vec_array = vec![ ("MASQ_BLOCKCHAIN_SERVICE_URL", "https://www.mainnet2.com"), #[cfg(not(target_os = "windows"))] @@ -1116,65 +1091,42 @@ mod tests { .clone() .into_iter() .for_each(|(name, value)| std::env::set_var(name, value)); - #[cfg(not(target_os = "windows"))] - let args = ArgsBuilder::new() - .param("--blockchain-service-url", "https://www.mainnet1.com") - .param("--config-file", "~/masqhome/config.toml") - .param("--data-directory", "~/masqhome"); - #[cfg(target_os = "windows")] let args = ArgsBuilder::new() .param("--blockchain-service-url", "https://www.mainnet1.com") .param("--config-file", "~\\masqhome\\config.toml") .param("--data-directory", "~\\masqhome"); let args_vec: Vec = args.into(); - let dir_wrapper = DirsWrapperReal {}; + let dir_wrapper = DirsWrapperMock { + data_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&data_dir))), + home_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&home_dir))), + }; let result = server_initializer_collected_params(&dir_wrapper, args_vec.as_slice()); let multiconfig = result.unwrap(); + assert_eq!( + value_m!(multiconfig, "data-directory", String).unwrap(), + current_dir() + .unwrap() + .join(&data_dir) + .to_string_lossy() + .to_string() + ); + assert_eq!( + value_m!(multiconfig, "config-file", String).unwrap(), + current_dir() + .unwrap() + .join(data_dir) + .join(PathBuf::from("config.toml")) + .to_string_lossy() + .to_string() + ); #[cfg(not(target_os = "windows"))] { - assert_eq!( - value_m!(multiconfig, "data-directory", String).unwrap(), - current_dir() - .unwrap() - .join(&data_dir) - .to_string_lossy() - .to_string() - ); assert_eq!( value_m!(multiconfig, "real-user", String).unwrap(), "9999:9999:booga" ); - assert_eq!( - value_m!(multiconfig, "config-file", String).unwrap(), - current_dir() - .unwrap() - .join(data_dir) - .join(PathBuf::from("config.toml")) - .to_string_lossy() - .to_string() - ); - } - #[cfg(target_os = "windows")] - { - assert_eq!( - value_m!(multiconfig, "data-directory", String).unwrap(), - dirs_home_dir() - .unwrap() - .join("masqhome") - .to_string_lossy() - .to_string() - ); - assert_eq!( - value_m!(multiconfig, "config-file", String).unwrap(), - dirs_home_dir() - .unwrap() - .join("masqhome") - .join(PathBuf::from("config.toml")) - .to_string_lossy() - .to_string() - ); } assert_eq!( value_m!(multiconfig, "blockchain-service-url", String).unwrap(), diff --git a/node/src/test_utils/mod.rs b/node/src/test_utils/mod.rs index 60a9b7741..92de1b441 100644 --- a/node/src/test_utils/mod.rs +++ b/node/src/test_utils/mod.rs @@ -51,17 +51,20 @@ use serde_derive::{Deserialize, Serialize}; use std::collections::btree_set::BTreeSet; use std::collections::HashSet; use std::convert::From; +use std::ffi::OsString; use std::fmt::Debug; +use std::fs::read_dir; use std::hash::Hash; use std::io::ErrorKind; use std::io::Read; use std::iter::repeat; use std::net::{Shutdown, TcpStream}; +use std::path::PathBuf; use std::str::FromStr; use std::sync::{Arc, Mutex}; -use std::thread; use std::time::Duration; use std::time::Instant; +use std::{env, io, thread}; use web3::types::{Address, U256}; lazy_static! { @@ -1219,9 +1222,28 @@ pub mod unshared_test_utils { } } +pub fn get_project_root() -> io::Result { + let path = env::current_dir()?; + let mut path_ancestors = path.as_path().ancestors(); + + while let Some(p) = path_ancestors.next() { + let has_cargo = read_dir(p)? + .into_iter() + .any(|p| p.unwrap().file_name() == OsString::from("Cargo.lock")); + if has_cargo { + return Ok(PathBuf::from(p)); + } + } + Err(io::Error::new( + ErrorKind::NotFound, + "Ran out of places to find Cargo.toml", + )) +} + #[cfg(test)] mod tests { use std::borrow::BorrowMut; + use std::fs::read_to_string; use std::iter; use std::sync::{Arc, Mutex}; use std::thread; @@ -1400,4 +1422,15 @@ mod tests { // exactly the same object that went into the black box at some other point, when the object // itself does not otherwise provide enough identifying information to make the assertion. } + + #[test] + fn it_should_find_our_project_root() { + let crate_name = "name = \"node\""; + + let project_root = get_project_root().expect("There is no project root"); + + let toml_path = project_root.to_str().unwrap().to_owned() + "/Cargo.toml"; + let toml_string = read_to_string(toml_path).unwrap(); + assert!(toml_string.contains(crate_name)); + } } From 752407d3605531ada21ed6c8a278f8c2245e0000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 10 Apr 2024 18:09:54 +0200 Subject: [PATCH 15/16] remove unnecesary function for finding project root, use of current dir for DirsWrapperMock --- node/src/daemon/setup_reporter.rs | 9 ++-- .../node_configurator_standard.rs | 12 +++-- node/src/test_utils/mod.rs | 48 ++++--------------- 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index 779797a65..5ca0d17c4 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -1224,7 +1224,7 @@ mod tests { make_persistent_config_real_with_config_dao_null, make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; - use crate::test_utils::{assert_string_contains, get_project_root, rate_pack}; + use crate::test_utils::{assert_string_contains, rate_pack}; use core::option::Option; use masq_lib::blockchains::chains::Chain as Blockchain; use masq_lib::blockchains::chains::Chain::PolyMumbai; @@ -1238,7 +1238,6 @@ mod tests { use std::convert::TryFrom; #[cfg(not(target_os = "windows"))] use std::default::Default; - use std::env; use std::env::current_dir; use std::fs::{create_dir_all, File}; use std::io::Write; @@ -2051,7 +2050,7 @@ mod tests { let _guard = EnvironmentGuard::new(); let base_dir = ensure_node_home_directory_exists( "setup_reporter", - "get_modified_setup_tilde_in_data_directory", + "get_modified_setup_tilde_in_config_file_path", ); let data_dir = base_dir.join("data_dir"); std::fs::create_dir_all(base_dir.join("masqhome")).unwrap(); @@ -2080,8 +2079,8 @@ mod tests { let expected_config_file_data = "https://www.mainnet.com"; //let dirs_wrapper = Box::new(DirsWrapperReal {}); let dirs_wrapper = DirsWrapperMock { - data_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&data_dir))), - home_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&base_dir))), + data_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&data_dir))), + home_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&base_dir))), }; let subject = SetupReporterReal::new(Box::new(dirs_wrapper)); diff --git a/node/src/node_configurator/node_configurator_standard.rs b/node/src/node_configurator/node_configurator_standard.rs index e96ba5af6..55c892b4f 100644 --- a/node/src/node_configurator/node_configurator_standard.rs +++ b/node/src/node_configurator/node_configurator_standard.rs @@ -375,7 +375,7 @@ mod tests { use crate::test_utils::unshared_test_utils::{ make_pre_populated_mocked_directory_wrapper, make_simplified_multi_config, }; - use crate::test_utils::{assert_string_contains, get_project_root, main_cryptde, ArgsBuilder}; + use crate::test_utils::{assert_string_contains, main_cryptde, ArgsBuilder}; use masq_lib::blockchains::chains::Chain; use masq_lib::constants::DEFAULT_CHAIN; use masq_lib::multi_config::VirtualCommandLine; @@ -1091,14 +1091,20 @@ mod tests { .clone() .into_iter() .for_each(|(name, value)| std::env::set_var(name, value)); + #[cfg(not(target_os = "windows"))] + let args = ArgsBuilder::new() + .param("--blockchain-service-url", "https://www.mainnet1.com") + .param("--config-file", "~/masqhome/config.toml") + .param("--data-directory", "~/masqhome"); + #[cfg(target_os = "windows")] let args = ArgsBuilder::new() .param("--blockchain-service-url", "https://www.mainnet1.com") .param("--config-file", "~\\masqhome\\config.toml") .param("--data-directory", "~\\masqhome"); let args_vec: Vec = args.into(); let dir_wrapper = DirsWrapperMock { - data_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&data_dir))), - home_dir_result: Some(PathBuf::from(get_project_root().unwrap().join(&home_dir))), + data_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&data_dir))), + home_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&home_dir))), }; let result = server_initializer_collected_params(&dir_wrapper, args_vec.as_slice()); diff --git a/node/src/test_utils/mod.rs b/node/src/test_utils/mod.rs index 92de1b441..c596fdc10 100644 --- a/node/src/test_utils/mod.rs +++ b/node/src/test_utils/mod.rs @@ -51,20 +51,19 @@ use serde_derive::{Deserialize, Serialize}; use std::collections::btree_set::BTreeSet; use std::collections::HashSet; use std::convert::From; -use std::ffi::OsString; use std::fmt::Debug; -use std::fs::read_dir; + use std::hash::Hash; use std::io::ErrorKind; use std::io::Read; use std::iter::repeat; use std::net::{Shutdown, TcpStream}; -use std::path::PathBuf; + use std::str::FromStr; use std::sync::{Arc, Mutex}; +use std::thread; use std::time::Duration; use std::time::Instant; -use std::{env, io, thread}; use web3::types::{Address, U256}; lazy_static! { @@ -1222,39 +1221,19 @@ pub mod unshared_test_utils { } } -pub fn get_project_root() -> io::Result { - let path = env::current_dir()?; - let mut path_ancestors = path.as_path().ancestors(); - - while let Some(p) = path_ancestors.next() { - let has_cargo = read_dir(p)? - .into_iter() - .any(|p| p.unwrap().file_name() == OsString::from("Cargo.lock")); - if has_cargo { - return Ok(PathBuf::from(p)); - } - } - Err(io::Error::new( - ErrorKind::NotFound, - "Ran out of places to find Cargo.toml", - )) -} - #[cfg(test)] mod tests { - use std::borrow::BorrowMut; - use std::fs::read_to_string; - use std::iter; - use std::sync::{Arc, Mutex}; - use std::thread; - use std::time::Duration; - use crate::sub_lib::cryptde::CryptData; use crate::sub_lib::hop::LiveHop; use crate::sub_lib::neighborhood::ExpectedService; use crate::test_utils::unshared_test_utils::arbitrary_id_stamp::{ ArbitraryIdStamp, FirstTraitMock, SecondTraitMock, TestSubject, }; + use std::borrow::BorrowMut; + use std::iter; + use std::sync::{Arc, Mutex}; + use std::thread; + use std::time::Duration; use super::*; @@ -1422,15 +1401,4 @@ mod tests { // exactly the same object that went into the black box at some other point, when the object // itself does not otherwise provide enough identifying information to make the assertion. } - - #[test] - fn it_should_find_our_project_root() { - let crate_name = "name = \"node\""; - - let project_root = get_project_root().expect("There is no project root"); - - let toml_path = project_root.to_str().unwrap().to_owned() + "/Cargo.toml"; - let toml_string = read_to_string(toml_path).unwrap(); - assert!(toml_string.contains(crate_name)); - } } From 94ea1b1b56252b54ff19a8422d7d7db8e4ad4c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojte=CC=8Cch=20Parka=CC=81n?= Date: Wed, 24 Apr 2024 08:23:48 +0200 Subject: [PATCH 16/16] adjusting name of test and removing commented out code --- node/src/daemon/setup_reporter.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/node/src/daemon/setup_reporter.rs b/node/src/daemon/setup_reporter.rs index 5d993ef4e..b1f87ddd7 100644 --- a/node/src/daemon/setup_reporter.rs +++ b/node/src/daemon/setup_reporter.rs @@ -2046,11 +2046,11 @@ mod tests { } #[test] - fn get_modified_setup_tilde_in_config_file_path() { + fn get_modified_setup_handles_tilde_in_config_file_and_data_directory_path() { let _guard = EnvironmentGuard::new(); let base_dir = ensure_node_home_directory_exists( "setup_reporter", - "get_modified_setup_tilde_in_config_file_path", + "get_modified_setup_handles_tilde_in_config_file_and_data_directory_path", ); let data_dir = base_dir.join("data_dir"); std::fs::create_dir_all(base_dir.join("masqhome")).unwrap(); @@ -2077,7 +2077,6 @@ mod tests { .collect_vec(); let expected_config_file_data = "https://www.mainnet.com"; - //let dirs_wrapper = Box::new(DirsWrapperReal {}); let dirs_wrapper = DirsWrapperMock { data_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&data_dir))), home_dir_result: Some(PathBuf::from(current_dir().unwrap().join(&base_dir))),