From a76a51e823fe855aa8580db525131164ff3476d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Wed, 14 Jun 2023 16:44:01 +0100 Subject: [PATCH] fixed config version of binaries depending on socks5 core configs --- clients/socks5/src/config/mod.rs | 6 +++++- common/socks5-client-core/src/config/mod.rs | 4 ++-- nym-connect/desktop/src-tauri/src/config/mod.rs | 6 +++++- sdk/lib/socks5-listener/src/config/mod.rs | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/clients/socks5/src/config/mod.rs b/clients/socks5/src/config/mod.rs index 1ca4c2b0ac..f4f74942cf 100644 --- a/clients/socks5/src/config/mod.rs +++ b/clients/socks5/src/config/mod.rs @@ -70,7 +70,11 @@ impl NymConfigTemplate for Config { impl Config { pub fn new>(id: S, provider_mix_address: S) -> Self { Config { - core: CoreConfig::new(id.as_ref(), provider_mix_address.as_ref()), + core: CoreConfig::new( + id.as_ref(), + env!("CARGO_PKG_VERSION"), + provider_mix_address.as_ref(), + ), storage_paths: SocksClientPaths::new_default(default_data_directory(id.as_ref())), logging: Default::default(), } diff --git a/common/socks5-client-core/src/config/mod.rs b/common/socks5-client-core/src/config/mod.rs index 51d0539439..6a34a06d22 100644 --- a/common/socks5-client-core/src/config/mod.rs +++ b/common/socks5-client-core/src/config/mod.rs @@ -27,9 +27,9 @@ pub struct Config { } impl Config { - pub fn new>(id: S, provider_mix_address: S) -> Self { + pub fn new>(id: S, version: S, provider_mix_address: S) -> Self { Config { - base: BaseClientConfig::new(id.into(), env!("CARGO_PKG_VERSION").to_string()), + base: BaseClientConfig::new(id, version), socks5: Socks5::new(provider_mix_address), } } diff --git a/nym-connect/desktop/src-tauri/src/config/mod.rs b/nym-connect/desktop/src-tauri/src/config/mod.rs index 79dc15e5af..a2c356f4b5 100644 --- a/nym-connect/desktop/src-tauri/src/config/mod.rs +++ b/nym-connect/desktop/src-tauri/src/config/mod.rs @@ -73,7 +73,11 @@ pub fn socks5_config_id_appended_with(gateway_id: &str) -> String { impl Config { pub fn new>(id: S, provider_mix_address: S) -> Self { Config { - core: Socks5CoreConfig::new(id.as_ref(), provider_mix_address.as_ref()), + core: Socks5CoreConfig::new( + id.as_ref(), + env!("CARGO_PKG_VERSION"), + provider_mix_address.as_ref(), + ), storage_paths: NymConnectPaths::new_default(default_data_directory(id.as_ref())), } } diff --git a/sdk/lib/socks5-listener/src/config/mod.rs b/sdk/lib/socks5-listener/src/config/mod.rs index f2c80303d9..c6a7060954 100644 --- a/sdk/lib/socks5-listener/src/config/mod.rs +++ b/sdk/lib/socks5-listener/src/config/mod.rs @@ -67,7 +67,11 @@ impl Config { S: AsRef, { Config { - core: CoreConfig::new(id.as_ref(), provider_mix_address.as_ref()), + core: CoreConfig::new( + id.as_ref(), + env!("CARGO_PKG_VERSION"), + provider_mix_address.as_ref(), + ), storage_paths: storage_root.map(|storage_root| { MobileSocksClientPaths::new_default(data_directory_from_root( storage_root,