diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs index 8a544b6e2..72b998a31 100644 --- a/packages/configuration/src/lib.rs +++ b/packages/configuration/src/lib.rs @@ -4,7 +4,7 @@ //! Torrust Tracker, which is a `BitTorrent` tracker server. //! //! The current version for configuration is [`v1`]. -pub mod v1; +pub mod v2; use std::collections::HashMap; use std::env; @@ -34,12 +34,12 @@ const ENV_VAR_CONFIG_TOML: &str = "TORRUST_TRACKER_CONFIG_TOML"; /// The `tracker.toml` file location. pub const ENV_VAR_CONFIG_TOML_PATH: &str = "TORRUST_TRACKER_CONFIG_TOML_PATH"; -pub type Configuration = v1::Configuration; -pub type Core = v1::core::Core; -pub type HealthCheckApi = v1::health_check_api::HealthCheckApi; -pub type HttpApi = v1::tracker_api::HttpApi; -pub type HttpTracker = v1::http_tracker::HttpTracker; -pub type UdpTracker = v1::udp_tracker::UdpTracker; +pub type Configuration = v2::Configuration; +pub type Core = v2::core::Core; +pub type HealthCheckApi = v2::health_check_api::HealthCheckApi; +pub type HttpApi = v2::tracker_api::HttpApi; +pub type HttpTracker = v2::http_tracker::HttpTracker; +pub type UdpTracker = v2::udp_tracker::UdpTracker; pub type AccessTokens = HashMap; diff --git a/packages/configuration/src/v1/core.rs b/packages/configuration/src/v2/core.rs similarity index 98% rename from packages/configuration/src/v1/core.rs rename to packages/configuration/src/v2/core.rs index 1f0a0f957..09280917c 100644 --- a/packages/configuration/src/v1/core.rs +++ b/packages/configuration/src/v2/core.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use super::network::Network; -use crate::v1::database::Database; +use crate::v2::database::Database; use crate::{AnnouncePolicy, TrackerPolicy}; #[allow(clippy::struct_excessive_bools)] diff --git a/packages/configuration/src/v1/database.rs b/packages/configuration/src/v2/database.rs similarity index 100% rename from packages/configuration/src/v1/database.rs rename to packages/configuration/src/v2/database.rs diff --git a/packages/configuration/src/v1/health_check_api.rs b/packages/configuration/src/v2/health_check_api.rs similarity index 100% rename from packages/configuration/src/v1/health_check_api.rs rename to packages/configuration/src/v2/health_check_api.rs diff --git a/packages/configuration/src/v1/http_tracker.rs b/packages/configuration/src/v2/http_tracker.rs similarity index 100% rename from packages/configuration/src/v1/http_tracker.rs rename to packages/configuration/src/v2/http_tracker.rs diff --git a/packages/configuration/src/v1/logging.rs b/packages/configuration/src/v2/logging.rs similarity index 100% rename from packages/configuration/src/v1/logging.rs rename to packages/configuration/src/v2/logging.rs diff --git a/packages/configuration/src/v1/mod.rs b/packages/configuration/src/v2/mod.rs similarity index 99% rename from packages/configuration/src/v1/mod.rs rename to packages/configuration/src/v2/mod.rs index c5e0f9f7a..80e6cc0e6 100644 --- a/packages/configuration/src/v1/mod.rs +++ b/packages/configuration/src/v2/mod.rs @@ -357,7 +357,7 @@ mod tests { use std::net::{IpAddr, Ipv4Addr}; - use crate::v1::Configuration; + use crate::v2::Configuration; use crate::Info; #[cfg(test)] diff --git a/packages/configuration/src/v1/network.rs b/packages/configuration/src/v2/network.rs similarity index 100% rename from packages/configuration/src/v1/network.rs rename to packages/configuration/src/v2/network.rs diff --git a/packages/configuration/src/v1/tracker_api.rs b/packages/configuration/src/v2/tracker_api.rs similarity index 98% rename from packages/configuration/src/v1/tracker_api.rs rename to packages/configuration/src/v2/tracker_api.rs index 302a4ee95..1a2e0cbf0 100644 --- a/packages/configuration/src/v1/tracker_api.rs +++ b/packages/configuration/src/v2/tracker_api.rs @@ -65,7 +65,7 @@ impl HttpApi { #[cfg(test)] mod tests { - use crate::v1::tracker_api::HttpApi; + use crate::v2::tracker_api::HttpApi; #[test] fn http_api_configuration_should_check_if_it_contains_a_token() { diff --git a/packages/configuration/src/v1/udp_tracker.rs b/packages/configuration/src/v2/udp_tracker.rs similarity index 100% rename from packages/configuration/src/v1/udp_tracker.rs rename to packages/configuration/src/v2/udp_tracker.rs diff --git a/src/bootstrap/jobs/torrent_cleanup.rs b/src/bootstrap/jobs/torrent_cleanup.rs index 992e7e644..c0890f6ac 100644 --- a/src/bootstrap/jobs/torrent_cleanup.rs +++ b/src/bootstrap/jobs/torrent_cleanup.rs @@ -14,7 +14,7 @@ use std::sync::Arc; use chrono::Utc; use tokio::task::JoinHandle; -use torrust_tracker_configuration::v1::core::Core; +use torrust_tracker_configuration::v2::core::Core; use tracing::info; use crate::core;