backwards compatibility

This commit is contained in:
Jędrzej Stuczyński
2023-03-20 16:11:03 +00:00
parent f61ed48240
commit 6ffd211e51
10 changed files with 419 additions and 46 deletions
+1
View File
@@ -15,6 +15,7 @@ pub use client_core::config::Config as BaseConfig;
pub use client_core::config::MISSING_VALUE;
pub use client_core::config::{DebugConfig, GatewayEndpointConfig};
pub mod old_config;
mod template;
#[derive(Debug, Deserialize, PartialEq, Eq, Serialize, Clone, Copy)]
@@ -0,0 +1,60 @@
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: Apache-2.0
use crate::client::config::{Config, Socket};
use client_core::config::old_config::OldConfig as OldBaseConfig;
use nym_config::NymConfig;
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
#[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
#[serde(deny_unknown_fields)]
pub struct OldConfig {
#[serde(flatten)]
base: OldBaseConfig<OldConfig>,
socket: Socket,
}
impl NymConfig for OldConfig {
fn template() -> &'static str {
// not intended to be used
unimplemented!()
}
fn default_root_directory() -> PathBuf {
dirs::home_dir()
.expect("Failed to evaluate $HOME value")
.join(".nym")
.join("clients")
}
fn try_default_root_directory() -> Option<PathBuf> {
dirs::home_dir().map(|path| path.join(".nym").join("clients"))
}
fn root_directory(&self) -> PathBuf {
self.base.client.nym_root_directory.clone()
}
fn config_directory(&self) -> PathBuf {
self.root_directory()
.join(&self.base.client.id)
.join("config")
}
fn data_directory(&self) -> PathBuf {
self.root_directory()
.join(&self.base.client.id)
.join("data")
}
}
impl From<OldConfig> for Config {
fn from(value: OldConfig) -> Self {
Config {
base: value.base.into(),
socket: value.socket,
}
}
}
+7 -7
View File
@@ -110,15 +110,15 @@ host = '{{ socket.host }}'
[debug]
[[debug.traffic]]
average_packet_delay = '{{ debug.average_packet_delay }}'
message_sending_average_delay = '{{ debug.message_sending_average_delay }}'
[debug.traffic]
average_packet_delay = '{{ debug.traffic.average_packet_delay }}'
message_sending_average_delay = '{{ debug.traffic.message_sending_average_delay }}'
[[debug.acknowledgements]]
average_ack_delay = '{{ debug.average_ack_delay }}'
[debug.acknowledgements]
average_ack_delay = '{{ debug.acknowledgements.average_ack_delay }}'
[[debug.cover_traffic]]
loop_cover_traffic_average_delay = '{{ debug.loop_cover_traffic_average_delay }}'
[debug.cover_traffic]
loop_cover_traffic_average_delay = '{{ debug.cover_traffic.loop_cover_traffic_average_delay }}'
"#
}