Skip to content

Commit 1eca6a3

Browse files
josecelanojosecelano
committed
refactor: [torrust#1298] rename struct and field
1 parent b562f8d commit 1eca6a3

File tree

7 files changed

+73
-33
lines changed

7 files changed

+73
-33
lines changed

‎packages/axum-http-tracker-server/src/server.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::sync::Arc;
44

55
use axum_server::tls_rustls::RustlsConfig;
66
use axum_server::Handle;
7-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
7+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
88
use derive_more::Constructor;
99
use futures::future::BoxFuture;
1010
use tokio::sync::oneshot::{Receiver, Sender};
@@ -45,7 +45,7 @@ impl Launcher {
4545
#[instrument(skip(self, http_tracker_container, tx_start, rx_halt))]
4646
fn start(
4747
&self,
48-
http_tracker_container: Arc<HttpTrackerContainer>,
48+
http_tracker_container: Arc<HttpTrackerCoreContainer>,
4949
tx_start: Sender<Started>,
5050
rx_halt: Receiver<Halted>,
5151
) -> BoxFuture<'static, ()> {
@@ -160,7 +160,7 @@ impl HttpServer<Stopped> {
160160
/// back to the main thread.
161161
pub async fn start(
162162
self,
163-
http_tracker_container: Arc<HttpTrackerContainer>,
163+
http_tracker_container: Arc<HttpTrackerCoreContainer>,
164164
form: ServiceRegistrationForm,
165165
) -> Result<HttpServer<Running>, Error> {
166166
let (tx_start, rx_start) = tokio::sync::oneshot::channel::<Started>();
@@ -238,7 +238,7 @@ pub fn check_fn(binding: &SocketAddr) -> ServiceHealthCheckJob {
238238
mod tests {
239239
use std::sync::Arc;
240240

241-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
241+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
242242
use bittorrent_tracker_core::announce_handler::AnnounceHandler;
243243
use bittorrent_tracker_core::authentication::key::repository::in_memory::InMemoryKeyRepository;
244244
use bittorrent_tracker_core::authentication::service;
@@ -255,7 +255,7 @@ mod tests {
255255

256256
use crate::server::{HttpServer, Launcher};
257257

258-
pub fn initialize_container(configuration: &Configuration) -> HttpTrackerContainer {
258+
pub fn initialize_container(configuration: &Configuration) -> HttpTrackerCoreContainer {
259259
let core_config = Arc::new(configuration.core.clone());
260260

261261
let http_trackers = configuration
@@ -293,7 +293,7 @@ mod tests {
293293

294294
let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
295295

296-
HttpTrackerContainer {
296+
HttpTrackerCoreContainer {
297297
core_config,
298298
announce_handler,
299299
scrape_handler,

‎packages/axum-http-tracker-server/src/v1/routes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use axum::response::Response;
99
use axum::routing::get;
1010
use axum::{BoxError, Router};
1111
use axum_client_ip::SecureClientIpSource;
12-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
12+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
1313
use hyper::{Request, StatusCode};
1414
use torrust_server_lib::logging::Latency;
1515
use torrust_tracker_configuration::DEFAULT_TIMEOUT;
@@ -31,7 +31,7 @@ use crate::HTTP_TRACKER_LOG_TARGET;
3131
/// > **NOTICE**: it's added a layer to get the client IP from the connection
3232
/// > info. The tracker could use the connection info to get the client IP.
3333
#[instrument(skip(http_tracker_container, server_socket_addr))]
34-
pub fn router(http_tracker_container: Arc<HttpTrackerContainer>, server_socket_addr: SocketAddr) -> Router {
34+
pub fn router(http_tracker_container: Arc<HttpTrackerCoreContainer>, server_socket_addr: SocketAddr) -> Router {
3535
Router::new()
3636
// Health check
3737
.route("/health_check", get(health_check::handler))

‎packages/http-tracker-core/src/container.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use torrust_tracker_configuration::{Core, HttpTracker};
99

1010
use crate::statistics;
1111

12-
pub struct HttpTrackerContainer {
12+
pub struct HttpTrackerCoreContainer {
1313
// todo: replace with TrackerCoreContainer
1414
pub core_config: Arc<Core>,
1515
pub announce_handler: Arc<AnnounceHandler>,
@@ -22,7 +22,7 @@ pub struct HttpTrackerContainer {
2222
pub http_stats_repository: Arc<statistics::repository::Repository>,
2323
}
2424

25-
impl HttpTrackerContainer {
25+
impl HttpTrackerCoreContainer {
2626
#[must_use]
2727
pub fn initialize_from(
2828
tracker_core_container: &Arc<TrackerCoreContainer>,

‎src/bootstrap/jobs/http_tracker.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::net::SocketAddr;
1414
use std::sync::Arc;
1515

1616
use axum_server::tls_rustls::RustlsConfig;
17-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
17+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
1818
use tokio::task::JoinHandle;
1919
use torrust_axum_http_tracker_server::server::{HttpServer, Launcher};
2020
use torrust_axum_http_tracker_server::Version;
@@ -32,7 +32,7 @@ use tracing::instrument;
3232
/// It would panic if the `config::HttpTracker` struct would contain inappropriate values.
3333
#[instrument(skip(http_tracker_container, form))]
3434
pub async fn start_job(
35-
http_tracker_container: Arc<HttpTrackerContainer>,
35+
http_tracker_container: Arc<HttpTrackerCoreContainer>,
3636
form: ServiceRegistrationForm,
3737
version: Version,
3838
) -> Option<JoinHandle<()>> {
@@ -52,7 +52,7 @@ pub async fn start_job(
5252
async fn start_v1(
5353
socket: SocketAddr,
5454
tls: Option<RustlsConfig>,
55-
http_tracker_container: Arc<HttpTrackerContainer>,
55+
http_tracker_container: Arc<HttpTrackerCoreContainer>,
5656
form: ServiceRegistrationForm,
5757
) -> JoinHandle<()> {
5858
let server = HttpServer::new(Launcher::new(socket, tls))
@@ -77,7 +77,7 @@ async fn start_v1(
7777
mod tests {
7878
use std::sync::Arc;
7979

80-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
80+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
8181
use torrust_axum_http_tracker_server::Version;
8282
use torrust_server_lib::registar::Registar;
8383
use torrust_tracker_test_helpers::configuration::ephemeral_public;
@@ -94,7 +94,7 @@ mod tests {
9494

9595
initialize_global_services(&cfg);
9696

97-
let http_tracker_container = HttpTrackerContainer::initialize(&core_config, &http_tracker_config);
97+
let http_tracker_container = HttpTrackerCoreContainer::initialize(&core_config, &http_tracker_config);
9898

9999
let version = Version::V1;
100100

‎src/container.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::sync::Arc;
22

3-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
3+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
44
use bittorrent_tracker_core::announce_handler::AnnounceHandler;
55
use bittorrent_tracker_core::authentication::handler::KeysHandler;
66
use bittorrent_tracker_core::authentication::service::AuthenticationService;
@@ -44,8 +44,8 @@ pub struct AppContainer {
4444

4545
impl AppContainer {
4646
#[must_use]
47-
pub fn http_tracker_container(&self, http_tracker_config: &Arc<HttpTracker>) -> HttpTrackerContainer {
48-
HttpTrackerContainer {
47+
pub fn http_tracker_container(&self, http_tracker_config: &Arc<HttpTracker>) -> HttpTrackerCoreContainer {
48+
HttpTrackerCoreContainer {
4949
core_config: self.core_config.clone(),
5050
announce_handler: self.announce_handler.clone(),
5151
scrape_handler: self.scrape_handler.clone(),

‎tests/servers/http/environment.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::sync::Arc;
22

3-
use bittorrent_http_tracker_core::container::HttpTrackerContainer;
3+
use bittorrent_http_tracker_core::container::HttpTrackerCoreContainer;
44
use bittorrent_primitives::info_hash::InfoHash;
55
use bittorrent_tracker_core::container::TrackerCoreContainer;
66
use futures::executor::block_on;
@@ -35,10 +35,10 @@ impl Environment<Stopped> {
3535

3636
let container = Arc::new(EnvContainer::initialize(configuration));
3737

38-
let bind_to = container.http_tracker_container.http_tracker_config.bind_address;
38+
let bind_to = container.http_tracker_core_container.http_tracker_config.bind_address;
3939

4040
let tls = block_on(make_rust_tls(
41-
&container.http_tracker_container.http_tracker_config.tsl_config,
41+
&container.http_tracker_core_container.http_tracker_config.tsl_config,
4242
))
4343
.map(|tls| tls.expect("tls config failed"));
4444

@@ -58,7 +58,7 @@ impl Environment<Stopped> {
5858
registar: self.registar.clone(),
5959
server: self
6060
.server
61-
.start(self.container.http_tracker_container.clone(), self.registar.give_form())
61+
.start(self.container.http_tracker_core_container.clone(), self.registar.give_form())
6262
.await
6363
.unwrap(),
6464
}
@@ -85,7 +85,7 @@ impl Environment<Running> {
8585

8686
pub struct EnvContainer {
8787
pub tracker_core_container: Arc<TrackerCoreContainer>,
88-
pub http_tracker_container: Arc<HttpTrackerContainer>,
88+
pub http_tracker_core_container: Arc<HttpTrackerCoreContainer>,
8989
}
9090

9191
impl EnvContainer {
@@ -98,11 +98,11 @@ impl EnvContainer {
9898
let http_tracker_config = Arc::new(http_tracker_config[0].clone());
9999

100100
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
101-
let http_tracker_container = HttpTrackerContainer::initialize_from(&tracker_core_container, &http_tracker_config);
101+
let http_tracker_container = HttpTrackerCoreContainer::initialize_from(&tracker_core_container, &http_tracker_config);
102102

103103
Self {
104104
tracker_core_container,
105-
http_tracker_container,
105+
http_tracker_core_container: http_tracker_container,
106106
}
107107
}
108108
}

‎tests/servers/http/v1/contract.rs

+48-8
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,12 @@ mod for_all_config_modes {
680680
.announce(&QueryBuilder::default().query())
681681
.await;
682682

683-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
683+
let stats = env
684+
.container
685+
.http_tracker_core_container
686+
.http_stats_repository
687+
.get_stats()
688+
.await;
684689

685690
assert_eq!(stats.tcp4_connections_handled, 1);
686691

@@ -706,7 +711,12 @@ mod for_all_config_modes {
706711
.announce(&QueryBuilder::default().query())
707712
.await;
708713

709-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
714+
let stats = env
715+
.container
716+
.http_tracker_core_container
717+
.http_stats_repository
718+
.get_stats()
719+
.await;
710720

711721
assert_eq!(stats.tcp6_connections_handled, 1);
712722

@@ -731,7 +741,12 @@ mod for_all_config_modes {
731741
)
732742
.await;
733743

734-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
744+
let stats = env
745+
.container
746+
.http_tracker_core_container
747+
.http_stats_repository
748+
.get_stats()
749+
.await;
735750

736751
assert_eq!(stats.tcp6_connections_handled, 0);
737752

@@ -750,7 +765,12 @@ mod for_all_config_modes {
750765
.announce(&QueryBuilder::default().query())
751766
.await;
752767

753-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
768+
let stats = env
769+
.container
770+
.http_tracker_core_container
771+
.http_stats_repository
772+
.get_stats()
773+
.await;
754774

755775
assert_eq!(stats.tcp4_announces_handled, 1);
756776

@@ -776,7 +796,12 @@ mod for_all_config_modes {
776796
.announce(&QueryBuilder::default().query())
777797
.await;
778798

779-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
799+
let stats = env
800+
.container
801+
.http_tracker_core_container
802+
.http_stats_repository
803+
.get_stats()
804+
.await;
780805

781806
assert_eq!(stats.tcp6_announces_handled, 1);
782807

@@ -801,7 +826,12 @@ mod for_all_config_modes {
801826
)
802827
.await;
803828

804-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
829+
let stats = env
830+
.container
831+
.http_tracker_core_container
832+
.http_stats_repository
833+
.get_stats()
834+
.await;
805835

806836
assert_eq!(stats.tcp6_announces_handled, 0);
807837

@@ -1189,7 +1219,12 @@ mod for_all_config_modes {
11891219
)
11901220
.await;
11911221

1192-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
1222+
let stats = env
1223+
.container
1224+
.http_tracker_core_container
1225+
.http_stats_repository
1226+
.get_stats()
1227+
.await;
11931228

11941229
assert_eq!(stats.tcp4_scrapes_handled, 1);
11951230

@@ -1221,7 +1256,12 @@ mod for_all_config_modes {
12211256
)
12221257
.await;
12231258

1224-
let stats = env.container.http_tracker_container.http_stats_repository.get_stats().await;
1259+
let stats = env
1260+
.container
1261+
.http_tracker_core_container
1262+
.http_stats_repository
1263+
.get_stats()
1264+
.await;
12251265

12261266
assert_eq!(stats.tcp6_scrapes_handled, 1);
12271267

0 commit comments

Comments
 (0)