Skip to content

Commit b09e79c

Browse files
josecelanojosecelano
committed
refactor: [#1534] Rename torrent_repository_container to swarm_coordination_registry_container
1 parent c26315a commit b09e79c

File tree

15 files changed

+54
-43
lines changed

15 files changed

+54
-43
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ 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(SwarmCoordinationRegistryContainer::initialize(
147+
let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
148148
configuration.core.tracker_usage_statistics.into(),
149149
));
150150

151151
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
152152
&core_config,
153-
&torrent_repository_container,
153+
&swarm_coordination_registry_container,
154154
));
155155

156156
let http_tracker_container =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,13 @@ 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(SwarmCoordinationRegistryContainer::initialize(
293+
let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
294294
configuration.core.tracker_usage_statistics.into(),
295295
));
296296

297297
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
298298
&core_config,
299-
&torrent_repository_container,
299+
&swarm_coordination_registry_container,
300300
));
301301

302302
let announce_service = Arc::new(AnnounceService::new(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ impl EnvContainer {
173173
.clone(),
174174
);
175175

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

180180
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
181181
&core_config,
182-
&torrent_repository_container,
182+
&swarm_coordination_registry_container,
183183
));
184184

185185
let http_tracker_core_container =
@@ -191,7 +191,7 @@ impl EnvContainer {
191191
let udp_tracker_server_container = UdpTrackerServerContainer::initialize(&core_config);
192192

193193
let tracker_http_api_core_container = TrackerHttpApiCoreContainer::initialize_from(
194-
&torrent_repository_container,
194+
&swarm_coordination_registry_container,
195195
&tracker_core_container,
196196
&http_tracker_core_container,
197197
&udp_tracker_core_container,

‎packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApi
3030
http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
3131
http_api_container.ban_service.clone(),
3232
// Stats
33-
http_api_container.torrent_repository_container.stats_repository.clone(),
33+
http_api_container
34+
.swarm_coordination_registry_container
35+
.stats_repository
36+
.clone(),
3437
http_api_container.tracker_core_container.stats_repository.clone(),
3538
http_api_container.http_stats_repository.clone(),
3639
http_api_container.udp_core_stats_repository.clone(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ 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(SwarmCoordinationRegistryContainer::initialize(
30+
let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3131
core_config.tracker_usage_statistics.into(),
3232
));
3333

3434
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
3535
core_config,
36-
&torrent_repository_container,
36+
&swarm_coordination_registry_container,
3737
));
3838

3939
Self::initialize_from_tracker_core(&tracker_core_container, http_tracker_config)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub struct TrackerHttpApiCoreContainer {
1414
pub http_api_config: Arc<HttpApi>,
1515

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

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

4343
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
4444
core_config,
45-
&torrent_repository_container,
45+
&swarm_coordination_registry_container,
4646
));
4747

4848
let http_tracker_core_container =
@@ -54,7 +54,7 @@ impl TrackerHttpApiCoreContainer {
5454
let udp_tracker_server_container = UdpTrackerServerContainer::initialize(core_config);
5555

5656
Self::initialize_from(
57-
&torrent_repository_container,
57+
&swarm_coordination_registry_container,
5858
&tracker_core_container,
5959
&http_tracker_core_container,
6060
&udp_tracker_core_container,
@@ -65,7 +65,7 @@ impl TrackerHttpApiCoreContainer {
6565

6666
#[must_use]
6767
pub fn initialize_from(
68-
torrent_repository_container: &Arc<SwarmCoordinationRegistryContainer>,
68+
swarm_coordination_registry_container: &Arc<SwarmCoordinationRegistryContainer>,
6969
tracker_core_container: &Arc<TrackerCoreContainer>,
7070
http_tracker_core_container: &Arc<HttpTrackerCoreContainer>,
7171
udp_tracker_core_container: &Arc<UdpTrackerCoreContainer>,
@@ -76,7 +76,7 @@ impl TrackerHttpApiCoreContainer {
7676
http_api_config: http_api_config.clone(),
7777

7878
// Torrent repository
79-
torrent_repository_container: torrent_repository_container.clone(),
79+
swarm_coordination_registry_container: swarm_coordination_registry_container.clone(),
8080

8181
// Tracker core
8282
tracker_core_container: tracker_core_container.clone(),

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,11 @@ mod tests {
180180
let config = tracker_configuration();
181181
let core_config = Arc::new(config.core.clone());
182182

183-
let torrent_repository_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(SenderStatus::Enabled));
183+
let swarm_coordination_registry_container =
184+
Arc::new(SwarmCoordinationRegistryContainer::initialize(SenderStatus::Enabled));
184185

185-
let tracker_core_container = TrackerCoreContainer::initialize_from(&core_config, &torrent_repository_container.clone());
186+
let tracker_core_container =
187+
TrackerCoreContainer::initialize_from(&core_config, &swarm_coordination_registry_container.clone());
186188

187189
let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
188190

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl TrackerCoreContainer {
4040
#[must_use]
4141
pub fn initialize_from(
4242
core_config: &Arc<Core>,
43-
torrent_repository_container: &Arc<SwarmCoordinationRegistryContainer>,
43+
swarm_coordination_registry_container: &Arc<SwarmCoordinationRegistryContainer>,
4444
) -> Self {
4545
let database = initialize_database(core_config);
4646
let in_memory_whitelist = Arc::new(InMemoryWhitelist::default());
@@ -53,7 +53,9 @@ impl TrackerCoreContainer {
5353
&db_key_repository.clone(),
5454
&in_memory_key_repository.clone(),
5555
));
56-
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::new(torrent_repository_container.swarms.clone()));
56+
let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::new(
57+
swarm_coordination_registry_container.swarms.clone(),
58+
));
5759
let db_downloads_metric_repository = Arc::new(DatabaseDownloadsMetricRepository::new(&database));
5860

5961
let torrents_manager = Arc::new(TorrentsManager::new(

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use torrust_tracker_primitives::DurationSinceUnixEpoch;
1717
use torrust_tracker_swarm_coordination_registry::container::SwarmCoordinationRegistryContainer;
1818

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

@@ -33,17 +33,17 @@ 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(SwarmCoordinationRegistryContainer::initialize(
36+
let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3737
core_config.tracker_usage_statistics.into(),
3838
));
3939

4040
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
4141
&core_config,
42-
&torrent_repository_container,
42+
&swarm_coordination_registry_container,
4343
));
4444

4545
Self {
46-
torrent_repository_container,
46+
swarm_coordination_registry_container,
4747
tracker_core_container,
4848
}
4949
}
@@ -68,13 +68,13 @@ impl TestEnv {
6868
let mut jobs = vec![];
6969

7070
let job = torrust_tracker_swarm_coordination_registry::statistics::event::listener::run_event_listener(
71-
self.torrent_repository_container.event_bus.receiver(),
72-
&self.torrent_repository_container.stats_repository,
71+
self.swarm_coordination_registry_container.event_bus.receiver(),
72+
&self.swarm_coordination_registry_container.stats_repository,
7373
);
7474
jobs.push(job);
7575

7676
let job = bittorrent_tracker_core::statistics::event::listener::run_event_listener(
77-
self.torrent_repository_container.event_bus.receiver(),
77+
self.swarm_coordination_registry_container.event_bus.receiver(),
7878
&self.tracker_core_container.stats_repository,
7979
&self.tracker_core_container.db_downloads_metric_repository,
8080
self.tracker_core_container
@@ -147,15 +147,19 @@ impl TestEnv {
147147
}
148148

149149
pub async fn get_swarm_metadata(&self, info_hash: &InfoHash) -> Option<SwarmMetadata> {
150-
self.torrent_repository_container
150+
self.swarm_coordination_registry_container
151151
.swarms
152152
.get_swarm_metadata(info_hash)
153153
.await
154154
.unwrap()
155155
}
156156

157157
pub async fn remove_swarm(&self, info_hash: &InfoHash) {
158-
self.torrent_repository_container.swarms.remove(info_hash).await.unwrap();
158+
self.swarm_coordination_registry_container
159+
.swarms
160+
.remove(info_hash)
161+
.await
162+
.unwrap();
159163
}
160164

161165
pub async fn get_counter_value(&self, metric_name: &str) -> u64 {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ 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(SwarmCoordinationRegistryContainer::initialize(
35+
let swarm_coordination_registry_container = Arc::new(SwarmCoordinationRegistryContainer::initialize(
3636
core_config.tracker_usage_statistics.into(),
3737
));
3838

3939
let tracker_core_container = Arc::new(TrackerCoreContainer::initialize_from(
4040
core_config,
41-
&torrent_repository_container,
41+
&swarm_coordination_registry_container,
4242
));
4343

4444
Self::initialize_from_tracker_core(&tracker_core_container, udp_tracker_config)

0 commit comments

Comments
 (0)