Skip to content

Commit

Permalink
refactor: renamed tracker_interface to server and shortened `conf…
Browse files Browse the repository at this point in the history
…iguration::ephemeral` calls
  • Loading branch information
mickvandijke authored and josecelano committed Mar 9, 2023
1 parent fac2be8 commit 5b95b5d
Show file tree
Hide file tree
Showing 12 changed files with 144 additions and 208 deletions.
3 changes: 2 additions & 1 deletion src/apis/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,14 @@ mod tests {
use std::sync::Arc;

use torrust_tracker_configuration::Configuration;
use torrust_tracker_test_helpers::configuration;

use crate::apis::server::ApiServer;
use crate::tracker;
use crate::tracker::statistics;

fn tracker_configuration() -> Arc<Configuration> {
Arc::new(torrust_tracker_test_helpers::configuration::ephemeral())
Arc::new(configuration::ephemeral())
}

#[tokio::test]
Expand Down
2 changes: 1 addition & 1 deletion src/http/axum_implementation/launcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use log::info;
use warp::hyper;

use super::routes::router;
use crate::http::tracker_interface::HttpServerLauncher;
use crate::http::server::HttpServerLauncher;
use crate::tracker::Tracker;

#[derive(Debug)]
Expand Down
2 changes: 1 addition & 1 deletion src/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};

pub mod axum_implementation;
pub mod percent_encoding;
pub mod tracker_interface;
pub mod server;
pub mod warp_implementation;

#[derive(Serialize, Deserialize, Copy, Clone, PartialEq, Eq, Debug)]
Expand Down
1 change: 1 addition & 0 deletions src/http/tracker_interface.rs → src/http/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pub type StoppedHttpServer<I> = HttpServer<Stopped<I>>;
#[allow(clippy::module_name_repetitions)]
pub type RunningHttpServer<I> = HttpServer<Running<I>>;

#[allow(clippy::module_name_repetitions)]
pub struct HttpServer<S> {
pub cfg: torrust_tracker_configuration::HttpTracker,
pub state: S,
Expand Down
2 changes: 1 addition & 1 deletion src/http/warp_implementation/launcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::sync::Arc;
use futures::future::BoxFuture;

use super::routes;
use crate::http::tracker_interface::HttpServerLauncher;
use crate::http::server::HttpServerLauncher;
use crate::tracker;
use crate::tracker::Tracker;

Expand Down
3 changes: 2 additions & 1 deletion src/tracker/services/statistics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ mod tests {
use std::sync::Arc;

use torrust_tracker_configuration::Configuration;
use torrust_tracker_test_helpers::configuration;

use crate::tracker;
use crate::tracker::services::common::tracker_factory;
use crate::tracker::services::statistics::{get_metrics, TrackerMetrics};

pub fn tracker_configuration() -> Arc<Configuration> {
Arc::new(torrust_tracker_test_helpers::configuration::ephemeral())
Arc::new(configuration::ephemeral())
}

#[tokio::test]
Expand Down
6 changes: 4 additions & 2 deletions src/tracker/services/torrent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,15 @@ mod tests {
use std::sync::Arc;

use torrust_tracker_configuration::Configuration;
use torrust_tracker_test_helpers::configuration;

use crate::protocol::info_hash::InfoHash;
use crate::tracker::services::common::tracker_factory;
use crate::tracker::services::torrent::tests::sample_peer;
use crate::tracker::services::torrent::{get_torrent_info, Info};

pub fn tracker_configuration() -> Arc<Configuration> {
Arc::new(torrust_tracker_test_helpers::configuration::ephemeral())
Arc::new(configuration::ephemeral())
}

#[tokio::test]
Expand Down Expand Up @@ -192,14 +193,15 @@ mod tests {
use std::sync::Arc;

use torrust_tracker_configuration::Configuration;
use torrust_tracker_test_helpers::configuration;

use crate::protocol::info_hash::InfoHash;
use crate::tracker::services::common::tracker_factory;
use crate::tracker::services::torrent::tests::sample_peer;
use crate::tracker::services::torrent::{get_torrents, BasicInfo, Pagination};

pub fn tracker_configuration() -> Arc<Configuration> {
Arc::new(torrust_tracker_test_helpers::configuration::ephemeral())
Arc::new(configuration::ephemeral())
}

#[tokio::test]
Expand Down
3 changes: 2 additions & 1 deletion src/udp/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ mod tests {
use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes};
use torrust_tracker_configuration::Configuration;
use torrust_tracker_primitives::TrackerMode;
use torrust_tracker_test_helpers::configuration;

use crate::protocol::clock::{Current, Time};
use crate::tracker::{self, peer, statistics};
Expand All @@ -261,7 +262,7 @@ mod tests {
}

fn default_testing_tracker_configuration() -> Configuration {
torrust_tracker_test_helpers::configuration::ephemeral()
configuration::ephemeral()
}

fn initialized_public_tracker() -> Arc<tracker::Tracker> {
Expand Down
3 changes: 2 additions & 1 deletion tests/api/test_environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use torrust_tracker::apis::server::{ApiServer, RunningApiServer, StoppedApiServe
use torrust_tracker::protocol::info_hash::InfoHash;
use torrust_tracker::tracker::peer::Peer;
use torrust_tracker::tracker::Tracker;
use torrust_tracker_test_helpers::configuration;

use super::connection_info::ConnectionInfo;
use crate::common::tracker::new_tracker;
Expand Down Expand Up @@ -89,7 +90,7 @@ pub fn running_test_environment() -> RunningTestEnvironment {
}

pub fn api_server() -> StoppedApiServer {
let config = Arc::new(torrust_tracker_test_helpers::configuration::ephemeral());
let config = Arc::new(configuration::ephemeral());

let tracker = new_tracker(config.clone());

Expand Down
2 changes: 1 addition & 1 deletion tests/http/test_environment.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::sync::Arc;

use torrust_tracker::http::tracker_interface::{HttpServer, HttpServerLauncher, RunningHttpServer, StoppedHttpServer};
use torrust_tracker::http::server::{HttpServer, HttpServerLauncher, RunningHttpServer, StoppedHttpServer};
use torrust_tracker::protocol::info_hash::InfoHash;
use torrust_tracker::tracker::peer::Peer;
use torrust_tracker::tracker::Tracker;
Expand Down
Loading

0 comments on commit 5b95b5d

Please sign in to comment.