Skip to content

Commit aa9f1c3

Browse files
committed
refactor: [torrust#1187] move fn initialize_tracker_dependencies
1 parent a4d8da0 commit aa9f1c3

File tree

11 files changed

+30
-22
lines changed

11 files changed

+30
-22
lines changed

src/app_test.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//! This file contains only functions used for testing.
2+
use std::sync::Arc;
3+
4+
use torrust_tracker_configuration::Configuration;
5+
6+
use crate::core::databases::Database;
7+
use crate::core::services::{initialize_database, initialize_whitelist};
8+
use crate::core::whitelist::WhiteListManager;
9+
10+
/// Initialize the tracker dependencies.
11+
#[allow(clippy::type_complexity)]
12+
#[must_use]
13+
pub fn initialize_tracker_dependencies(config: &Configuration) -> (Arc<Box<dyn Database>>, Arc<WhiteListManager>) {
14+
let database = initialize_database(config);
15+
let whitelist_manager = initialize_whitelist(database.clone());
16+
17+
(database, whitelist_manager)
18+
}

src/bootstrap/app.rs

-11
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ use tracing::instrument;
2222
use super::config::initialize_configuration;
2323
use crate::bootstrap;
2424
use crate::container::AppContainer;
25-
use crate::core::databases::Database;
2625
use crate::core::services::{initialize_database, initialize_whitelist, statistics, tracker_factory};
27-
use crate::core::whitelist::WhiteListManager;
2826
use crate::servers::udp::server::banning::BanService;
2927
use crate::servers::udp::server::launcher::MAX_CONNECTION_ID_ERRORS_PER_IP;
3028
use crate::shared::crypto::ephemeral_instance_keys;
@@ -115,15 +113,6 @@ pub fn initialize_static() {
115113
lazy_static::initialize(&ephemeral_instance_keys::ZEROED_TEST_CIPHER_BLOWFISH);
116114
}
117115

118-
#[allow(clippy::type_complexity)]
119-
#[must_use]
120-
pub fn initialize_tracker_dependencies(config: &Configuration) -> (Arc<Box<dyn Database>>, Arc<WhiteListManager>) {
121-
let database = initialize_database(config);
122-
let whitelist_manager = initialize_whitelist(database.clone());
123-
124-
(database, whitelist_manager)
125-
}
126-
127116
/// It initializes the log threshold, format and channel.
128117
///
129118
/// See [the logging setup](crate::bootstrap::logging::setup) for more info about logging.

src/core/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ mod tests {
10801080
use torrust_tracker_primitives::DurationSinceUnixEpoch;
10811081
use torrust_tracker_test_helpers::configuration;
10821082

1083-
use crate::bootstrap::app::initialize_tracker_dependencies;
1083+
use crate::app_test::initialize_tracker_dependencies;
10841084
use crate::core::peer::Peer;
10851085
use crate::core::services::tracker_factory;
10861086
use crate::core::whitelist::WhiteListManager;

src/core/services/statistics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ mod tests {
117117
use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
118118
use torrust_tracker_test_helpers::configuration;
119119

120-
use crate::bootstrap::app::initialize_tracker_dependencies;
120+
use crate::app_test::initialize_tracker_dependencies;
121121
use crate::core;
122122
use crate::core::services::statistics::{self, get_metrics, TrackerMetrics};
123123
use crate::core::services::tracker_factory;

src/core/services/torrent.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ mod tests {
129129
use torrust_tracker_configuration::Configuration;
130130
use torrust_tracker_test_helpers::configuration;
131131

132-
use crate::bootstrap::app::initialize_tracker_dependencies;
132+
use crate::app_test::initialize_tracker_dependencies;
133133
use crate::core::services::torrent::tests::sample_peer;
134134
use crate::core::services::torrent::{get_torrent_info, Info};
135135
use crate::core::services::tracker_factory;
@@ -191,7 +191,7 @@ mod tests {
191191
use torrust_tracker_configuration::Configuration;
192192
use torrust_tracker_test_helpers::configuration;
193193

194-
use crate::bootstrap::app::initialize_tracker_dependencies;
194+
use crate::app_test::initialize_tracker_dependencies;
195195
use crate::core::services::torrent::tests::sample_peer;
196196
use crate::core::services::torrent::{get_torrents_page, BasicInfo, Pagination};
197197
use crate::core::services::tracker_factory;

src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@
491491
use torrust_tracker_clock::clock;
492492

493493
pub mod app;
494+
pub mod app_test;
494495
pub mod bootstrap;
495496
pub mod console;
496497
pub mod container;

src/servers/http/v1/handlers/announce.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ mod tests {
205205
use bittorrent_primitives::info_hash::InfoHash;
206206
use torrust_tracker_test_helpers::configuration;
207207

208-
use crate::bootstrap::app::initialize_tracker_dependencies;
208+
use crate::app_test::initialize_tracker_dependencies;
209209
use crate::core::services::{statistics, tracker_factory};
210210
use crate::core::statistics::event::sender::Sender;
211211
use crate::core::Tracker;

src/servers/http/v1/handlers/scrape.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ mod tests {
126126
use bittorrent_primitives::info_hash::InfoHash;
127127
use torrust_tracker_test_helpers::configuration;
128128

129-
use crate::bootstrap::app::initialize_tracker_dependencies;
129+
use crate::app_test::initialize_tracker_dependencies;
130130
use crate::core::services::{statistics, tracker_factory};
131131
use crate::core::Tracker;
132132

src/servers/http/v1/services/announce.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mod tests {
6565
use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
6666
use torrust_tracker_test_helpers::configuration;
6767

68-
use crate::bootstrap::app::initialize_tracker_dependencies;
68+
use crate::app_test::initialize_tracker_dependencies;
6969
use crate::core::services::{statistics, tracker_factory};
7070
use crate::core::statistics::event::sender::Sender;
7171
use crate::core::Tracker;
@@ -123,7 +123,7 @@ mod tests {
123123
use torrust_tracker_test_helpers::configuration;
124124

125125
use super::{sample_peer_using_ipv4, sample_peer_using_ipv6};
126-
use crate::bootstrap::app::initialize_tracker_dependencies;
126+
use crate::app_test::initialize_tracker_dependencies;
127127
use crate::core::{statistics, PeersWanted, Tracker};
128128
use crate::servers::http::v1::services::announce::invoke;
129129
use crate::servers::http::v1::services::announce::tests::{public_tracker, sample_info_hash, sample_peer};

src/servers/http/v1/services/scrape.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ mod tests {
8080
use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
8181
use torrust_tracker_test_helpers::configuration;
8282

83-
use crate::bootstrap::app::initialize_tracker_dependencies;
83+
use crate::app_test::initialize_tracker_dependencies;
8484
use crate::core::services::tracker_factory;
8585
use crate::core::Tracker;
8686

src/servers/udp/handlers.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ mod tests {
470470
use torrust_tracker_test_helpers::configuration;
471471

472472
use super::gen_remote_fingerprint;
473-
use crate::bootstrap::app::initialize_tracker_dependencies;
473+
use crate::app_test::initialize_tracker_dependencies;
474474
use crate::core::services::{statistics, tracker_factory};
475475
use crate::core::statistics::event::sender::Sender;
476476
use crate::core::Tracker;
@@ -1318,7 +1318,7 @@ mod tests {
13181318
use aquatic_udp_protocol::{InfoHash as AquaticInfoHash, PeerId as AquaticPeerId};
13191319
use mockall::predicate::eq;
13201320

1321-
use crate::bootstrap::app::initialize_tracker_dependencies;
1321+
use crate::app_test::initialize_tracker_dependencies;
13221322
use crate::core::{self, statistics};
13231323
use crate::servers::udp::connection_cookie::make;
13241324
use crate::servers::udp::handlers::handle_announce;

0 commit comments

Comments
 (0)