From 99d0adc5bbd490d37bdefbd4ed419384fd1955ac Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Tue, 16 Jan 2024 14:57:14 +0100 Subject: [PATCH] settings: change default hostlist to .local/darkfi/CARGO_PKG_NAME also update tests --- src/net/settings.rs | 4 +++- src/net/tests.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/net/settings.rs b/src/net/settings.rs index 9707d7b0e..48d0f78d4 100644 --- a/src/net/settings.rs +++ b/src/net/settings.rs @@ -84,7 +84,9 @@ impl Default for Settings { fn default() -> Self { let version = option_env!("CARGO_PKG_VERSION").unwrap_or("0.0.0"); let app_version = semver::Version::parse(version).unwrap(); - let hostlist = String::from("~/.config/darkfi/hostlist.tsv"); + // TODO: We don't have a cross-platform method for the app directory (.local/darkfi) + // in util/path.rs currently. + let hostlist = String::from(format!("~/.local/darkfi/{}/hostlist.tsv", env!("CARGO_PKG_NAME"))); Self { node_id: String::new(), diff --git a/src/net/tests.rs b/src/net/tests.rs index 91ac422ff..7a374d330 100644 --- a/src/net/tests.rs +++ b/src/net/tests.rs @@ -107,7 +107,7 @@ async fn hostlist_propagation(ex: Arc>) { //outbound_connect_timeout: 10, inbound_connections: usize::MAX, seeds: vec![], - hostlist: String::from("~/.config/darkfi/seed.tsv"), + hostlist: String::from("~/.local/darkfi/p2p-test/seed.tsv"), peers: vec![], allowed_transports: vec!["tcp".to_string()], node_id: "seed".to_string(), @@ -136,7 +136,7 @@ async fn hostlist_propagation(ex: Arc>) { //outbound_connect_timeout: 10, inbound_connections: usize::MAX, seeds: vec![seed_addr.clone()], - hostlist: format!("~/.config/darkfi/hosts{}.tsv", i), + hostlist: format!("~/.local/darkfi/p2p-test/hosts{}.tsv", i), peers, allowed_transports: vec!["tcp".to_string()], node_id: i.to_string(),