Skip to content

Commit c26315a

Browse files
josecelanojosecelano
committed
refactor: [#1534] Rename TorrentRepositoryContainer type to SwarmCoordinationRegistryContainer
1 parent c67f27a commit c26315a

File tree

12 files changed

+31
-28
lines changed

12 files changed

+31
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use torrust_axum_server::tsl::make_rust_tls;
1010
use torrust_server_lib::registar::Registar;
1111
use torrust_tracker_configuration::{logging, Configuration};
1212
use torrust_tracker_primitives::peer;
13-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
13+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
1414

1515
use crate::server::{HttpServer, Launcher, Running, Stopped};
1616

@@ -144,7 +144,7 @@ impl EnvContainer {
144144
.expect("missing HTTP tracker configuration");
145145
let http_tracker_config = Arc::new(http_tracker_config[0].clone());
146146

147-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
147+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
148148
configuration.core.tracker_usage_statistics.into(),
149149
));
150150

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ mod tests {
259259
use torrust_axum_server::tsl::make_rust_tls;
260260
use torrust_server_lib::registar::Registar;
261261
use torrust_tracker_configuration::{logging, Configuration};
262-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
262+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
263263
use torrust_tracker_test_helpers::configuration::ephemeral_public;
264264

265265
use crate::server::{HttpServer, Launcher};
@@ -290,7 +290,7 @@ mod tests {
290290
let _unused = run_event_listener(http_stats_event_bus.receiver(), &http_stats_repository);
291291
}
292292

293-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
293+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
294294
configuration.core.tracker_usage_statistics.into(),
295295
));
296296

‎packages/axum-rest-tracker-api-server/src/environment.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use torrust_rest_tracker_api_core::container::TrackerHttpApiCoreContainer;
1212
use torrust_server_lib::registar::Registar;
1313
use torrust_tracker_configuration::{logging, Configuration};
1414
use torrust_tracker_primitives::peer;
15-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
15+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
1616
use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
1717

1818
use crate::server::{ApiServer, Launcher, Running, Stopped};
@@ -173,7 +173,7 @@ impl EnvContainer {
173173
.clone(),
174174
);
175175

176-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
176+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
177177
core_config.tracker_usage_statistics.into(),
178178
));
179179

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::sync::Arc;
22

33
use bittorrent_tracker_core::container::TrackerCoreContainer;
44
use torrust_tracker_configuration::{Core, HttpTracker};
5-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
5+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
66

77
use crate::event::bus::EventBus;
88
use crate::event::sender::Broadcaster;
@@ -27,7 +27,7 @@ pub struct HttpTrackerCoreContainer {
2727
impl HttpTrackerCoreContainer {
2828
#[must_use]
2929
pub fn initialize(core_config: &Arc<Core>, http_tracker_config: &Arc<HttpTracker>) -> Arc<Self> {
30-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
30+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3131
core_config.tracker_usage_statistics.into(),
3232
));
3333

‎packages/rest-tracker-api-core/src/container.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use bittorrent_udp_tracker_core::services::banning::BanService;
77
use bittorrent_udp_tracker_core::{self};
88
use tokio::sync::RwLock;
99
use torrust_tracker_configuration::{Core, HttpApi, HttpTracker, UdpTracker};
10-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
10+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
1111
use torrust_udp_tracker_server::container::UdpTrackerServerContainer;
1212

1313
pub struct TrackerHttpApiCoreContainer {
1414
pub http_api_config: Arc<HttpApi>,
1515

1616
// Torrent repository
17-
pub torrent_repository_container: Arc<TorrentRepositoryContainer>,
17+
pub torrent_repository_container: Arc<SwarmCoordinationRegistryContainer>,
1818

1919
// Tracker core
2020
pub tracker_core_container: Arc<TrackerCoreContainer>,
@@ -36,7 +36,7 @@ impl TrackerHttpApiCoreContainer {
3636
udp_tracker_config: &Arc<UdpTracker>,
3737
http_api_config: &Arc<HttpApi>,
3838
) -> Arc<TrackerHttpApiCoreContainer> {
39-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
39+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
4040
core_config.tracker_usage_statistics.into(),
4141
));
4242

@@ -65,7 +65,7 @@ impl TrackerHttpApiCoreContainer {
6565

6666
#[must_use]
6767
pub fn initialize_from(
68-
torrent_repository_container: &Arc<TorrentRepositoryContainer>,
68+
torrent_repository_container: &Arc<SwarmCoordinationRegistryContainer>,
6969
tracker_core_container: &Arc<TrackerCoreContainer>,
7070
http_tracker_core_container: &Arc<HttpTrackerCoreContainer>,
7171
udp_tracker_core_container: &Arc<UdpTrackerCoreContainer>,

‎packages/rest-tracker-api-core/src/statistics/services.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ mod tests {
165165
use tokio::sync::RwLock;
166166
use torrust_tracker_configuration::Configuration;
167167
use torrust_tracker_events::bus::SenderStatus;
168-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
168+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
169169
use torrust_tracker_test_helpers::configuration;
170170

171171
use crate::statistics::metrics::{ProtocolMetrics, TorrentsMetrics};
@@ -180,7 +180,7 @@ mod tests {
180180
let config = tracker_configuration();
181181
let core_config = Arc::new(config.core.clone());
182182

183-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(SenderStatus::Enabled));
183+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(SenderStatus::Enabled));
184184

185185
let tracker_core_container = TrackerCoreContainer::initialize_from(&core_config, &torrent_repository_container.clone());
186186

‎packages/swarm-coordination-registry/src/container.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use crate::event::{self};
88
use crate::statistics::repository::Repository;
99
use crate::{statistics, Registry};
1010

11-
pub struct TorrentRepositoryContainer {
11+
pub struct SwarmCoordinationRegistryContainer {
1212
pub swarms: Arc<Registry>,
1313
pub event_bus: Arc<event::bus::EventBus>,
1414
pub stats_event_sender: event::sender::Sender,
1515
pub stats_repository: Arc<statistics::repository::Repository>,
1616
}
1717

18-
impl TorrentRepositoryContainer {
18+
impl SwarmCoordinationRegistryContainer {
1919
#[must_use]
2020
pub fn initialize(sender_status: SenderStatus) -> Self {
2121
// Torrent repository stats

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::sync::Arc;
22

33
use torrust_tracker_configuration::Core;
4-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
4+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
55

66
use crate::announce_handler::AnnounceHandler;
77
use crate::authentication::handler::KeysHandler;
@@ -38,7 +38,10 @@ pub struct TrackerCoreContainer {
3838

3939
impl TrackerCoreContainer {
4040
#[must_use]
41-
pub fn initialize_from(core_config: &Arc<Core>, torrent_repository_container: &Arc<TorrentRepositoryContainer>) -> Self {
41+
pub fn initialize_from(
42+
core_config: &Arc<Core>,
43+
torrent_repository_container: &Arc<SwarmCoordinationRegistryContainer>,
44+
) -> Self {
4245
let database = initialize_database(core_config);
4346
let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
4447
let whitelist_authorization = Arc::new(WhitelistAuthorization::new(core_config, &in_memory_whitelist.clone()));

‎packages/tracker-core/tests/common/test_env.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ use torrust_tracker_primitives::core::{AnnounceData, ScrapeData};
1414
use torrust_tracker_primitives::peer::Peer;
1515
use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
1616
use torrust_tracker_primitives::DurationSinceUnixEpoch;
17-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
17+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
1818

1919
pub struct TestEnv {
20-
pub torrent_repository_container: Arc<TorrentRepositoryContainer>,
20+
pub torrent_repository_container: Arc<SwarmCoordinationRegistryContainer>,
2121
pub tracker_core_container: Arc<TrackerCoreContainer>,
2222
}
2323

@@ -33,7 +33,7 @@ impl TestEnv {
3333
pub fn new(core_config: Core) -> Self {
3434
let core_config = Arc::new(core_config);
3535

36-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
36+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3737
core_config.tracker_usage_statistics.into(),
3838
));
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::sync::Arc;
33
use bittorrent_tracker_core::container::TrackerCoreContainer;
44
use tokio::sync::RwLock;
55
use torrust_tracker_configuration::{Core, UdpTracker};
6-
use torrust_tracker_swarm_coordination_registry::container::TorrentRepositoryContainer;
6+
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
77

88
use crate::event::bus::EventBus;
99
use crate::event::sender::Broadcaster;
@@ -32,7 +32,7 @@ pub struct UdpTrackerCoreContainer {
3232
impl UdpTrackerCoreContainer {
3333
#[must_use]
3434
pub fn initialize(core_config: &Arc<Core>, udp_tracker_config: &Arc<UdpTracker>) -> Arc<UdpTrackerCoreContainer> {
35-
let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(
35+
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3636
core_config.tracker_usage_statistics.into(),
3737
));
3838

0 commit comments

Comments
 (0)