Skip to content

Commit c932c9c

Browse files
committed
Merge torrust#1169: Rename lib to torrust_tracker_lib
bfaf08b refactor: [torrust#1137] rename lib to torrust_tracker_lib (Jose Celano) Pull request description: Rename lib to `torrust_tracker_lib` to avoid collisions in docs: ```console cargo doc --no-deps --bins --examples --workspace --all-features ``` becuase the main binary and lib have the same name. Top commit has no ACKs. Tree-SHA512: 67f29ef45c76f607c9abbd1d5f4b315a550f0d13e78a73b4d16180d00add17656c490f6116c6190444bd10f9e1c4477835c91e4fd18a52021de55fde5ea088a2
2 parents 4291bba + bfaf08b commit c932c9c

30 files changed

+70
-67
lines changed

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ repository.workspace = true
1515
rust-version.workspace = true
1616
version.workspace = true
1717

18+
[lib]
19+
name = "torrust_tracker_lib"
20+
1821
[workspace.package]
1922
authors = ["Nautilus Cyberneering <info@nautilus-cyberneering.de>, Mick van Dijke <mick@dutchbits.nl>"]
2023
categories = ["network-programming", "web-programming"]

src/bin/e2e_tests_runner.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Program to run E2E tests.
2-
use torrust_tracker::console::ci::e2e;
2+
use torrust_tracker_lib::console::ci::e2e;
33

44
fn main() -> anyhow::Result<()> {
55
e2e::runner::run()

src/bin/profiling.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This binary is used for profiling with [valgrind](https://valgrind.org/)
22
//! and [kcachegrind](https://kcachegrind.github.io/).
3-
use torrust_tracker::console::profiling::run;
3+
use torrust_tracker_lib::console::profiling::run;
44

55
#[tokio::main]
66
async fn main() {

src/core/auth.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//! Keys are stored in this struct:
1313
//!
1414
//! ```rust,no_run
15-
//! use torrust_tracker::core::auth::Key;
15+
//! use torrust_tracker_lib::core::auth::Key;
1616
//! use torrust_tracker_primitives::DurationSinceUnixEpoch;
1717
//!
1818
//! pub struct ExpiringKey {
@@ -26,7 +26,7 @@
2626
//! You can generate a new key valid for `9999` seconds and `0` nanoseconds from the current time with the following:
2727
//!
2828
//! ```rust,no_run
29-
//! use torrust_tracker::core::auth;
29+
//! use torrust_tracker_lib::core::auth;
3030
//! use std::time::Duration;
3131
//!
3232
//! let expiring_key = auth::generate_key(Some(Duration::new(9999, 0)));
@@ -197,7 +197,7 @@ impl Key {
197197
/// Error returned when a key cannot be parsed from a string.
198198
///
199199
/// ```text
200-
/// use torrust_tracker::core::auth::Key;
200+
/// use torrust_tracker_lib::core::auth::Key;
201201
/// use std::str::FromStr;
202202
///
203203
/// let key_string = "YZSl4lMZupRuOpSRC3krIKR5BPB14nrJ";

src/core/databases/driver.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ pub enum Driver {
3030
/// Example for `SQLite3`:
3131
///
3232
/// ```text
33-
/// use torrust_tracker::core::databases;
34-
/// use torrust_tracker::core::databases::driver::Driver;
33+
/// use torrust_tracker_lib::core::databases;
34+
/// use torrust_tracker_lib::core::databases::driver::Driver;
3535
///
3636
/// let db_driver = Driver::Sqlite3;
3737
/// let db_path = "./storage/tracker/lib/database/sqlite3.db".to_string();
@@ -41,8 +41,8 @@ pub enum Driver {
4141
/// Example for `MySQL`:
4242
///
4343
/// ```text
44-
/// use torrust_tracker::core::databases;
45-
/// use torrust_tracker::core::databases::driver::Driver;
44+
/// use torrust_tracker_lib::core::databases;
45+
/// use torrust_tracker_lib::core::databases::driver::Driver;
4646
///
4747
/// let db_driver = Driver::MySQL;
4848
/// let db_path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker".to_string();

src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use torrust_tracker::{app, bootstrap};
1+
use torrust_tracker_lib::{app, bootstrap};
22

33
#[tokio::main]
44
async fn main() {

src/servers/http/v1/query.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl Query {
3131
/// input `name` exists. For example:
3232
///
3333
/// ```text
34-
/// use torrust_tracker::servers::http::v1::query::Query;
34+
/// use torrust_tracker_lib::servers::http::v1::query::Query;
3535
///
3636
/// let raw_query = "param1=value1&param2=value2";
3737
///
@@ -44,7 +44,7 @@ impl Query {
4444
/// It returns only the first param value even if it has multiple values:
4545
///
4646
/// ```text
47-
/// use torrust_tracker::servers::http::v1::query::Query;
47+
/// use torrust_tracker_lib::servers::http::v1::query::Query;
4848
///
4949
/// let raw_query = "param1=value1&param1=value2";
5050
///
@@ -60,7 +60,7 @@ impl Query {
6060
/// Returns all the param values as a vector.
6161
///
6262
/// ```text
63-
/// use torrust_tracker::servers::http::v1::query::Query;
63+
/// use torrust_tracker_lib::servers::http::v1::query::Query;
6464
///
6565
/// let query = "param1=value1&param1=value2".parse::<Query>().unwrap();
6666
///
@@ -73,7 +73,7 @@ impl Query {
7373
/// Returns all the param values as a vector even if it has only one value.
7474
///
7575
/// ```text
76-
/// use torrust_tracker::servers::http::v1::query::Query;
76+
/// use torrust_tracker_lib::servers::http::v1::query::Query;
7777
///
7878
/// let query = "param1=value1".parse::<Query>().unwrap();
7979
///

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const NUMWANT: &str = "numwant";
3131
///
3232
/// ```text
3333
/// use aquatic_udp_protocol::{NumberOfBytes, PeerId};
34-
/// use torrust_tracker::servers::http::v1::requests::announce::{Announce, Compact, Event};
34+
/// use torrust_tracker_lib::servers::http::v1::requests::announce::{Announce, Compact, Event};
3535
/// use bittorrent_primitives::info_hash::InfoHash;
3636
///
3737
/// let request = Announce {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl Into<Vec<u8>> for Compact {
154154
///
155155
/// ```text
156156
/// use std::net::{IpAddr, Ipv4Addr};
157-
/// use torrust_tracker::servers::http::v1::responses::announce::{Normal, NormalPeer};
157+
/// use torrust_tracker_lib::servers::http::v1::responses::announce::{Normal, NormalPeer};
158158
///
159159
/// let peer = NormalPeer {
160160
/// peer_id: *b"-qB00000000000000001",
@@ -206,7 +206,7 @@ impl From<&NormalPeer> for BencodeMut<'_> {
206206
///
207207
/// ```text
208208
/// use std::net::{IpAddr, Ipv4Addr};
209-
/// use torrust_tracker::servers::http::v1::responses::announce::{Compact, CompactPeer, CompactPeerData};
209+
/// use torrust_tracker_lib::servers::http::v1::responses::announce::{Compact, CompactPeer, CompactPeerData};
210210
///
211211
/// let peer = CompactPeer::V4(CompactPeerData {
212212
/// ip: Ipv4Addr::new(0x69, 0x69, 0x69, 0x69), // 105.105.105.105

src/servers/http/v1/responses/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl Error {
2727
/// Returns the bencoded representation of the `Error` struct.
2828
///
2929
/// ```text
30-
/// use torrust_tracker::servers::http::v1::responses::error::Error;
30+
/// use torrust_tracker_lib::servers::http::v1::responses::error::Error;
3131
///
3232
/// let err = Error {
3333
/// failure_reason: "error message".to_owned(),

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ use crate::core::ScrapeData;
1212
/// The `Scrape` response for the HTTP tracker.
1313
///
1414
/// ```text
15-
/// use torrust_tracker::servers::http::v1::responses::scrape::Bencoded;
15+
/// use torrust_tracker_lib::servers::http::v1::responses::scrape::Bencoded;
1616
/// use bittorrent_primitives::info_hash::InfoHash;
1717
/// use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
18-
/// use torrust_tracker::core::ScrapeData;
18+
/// use torrust_tracker_lib::core::ScrapeData;
1919
///
2020
/// let info_hash = InfoHash::from_bytes(&[0x69; 20]);
2121
/// let mut scrape_data = ScrapeData::empty();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub enum PeerIpResolutionError {
6363
/// use std::net::IpAddr;
6464
/// use std::str::FromStr;
6565
///
66-
/// use torrust_tracker::servers::http::v1::services::peer_ip_resolver::{invoke, ClientIpSources, PeerIpResolutionError};
66+
/// use torrust_tracker_lib::servers::http::v1::services::peer_ip_resolver::{invoke, ClientIpSources, PeerIpResolutionError};
6767
///
6868
/// let on_reverse_proxy = true;
6969
///
@@ -85,7 +85,7 @@ pub enum PeerIpResolutionError {
8585
/// use std::net::IpAddr;
8686
/// use std::str::FromStr;
8787
///
88-
/// use torrust_tracker::servers::http::v1::services::peer_ip_resolver::{invoke, ClientIpSources, PeerIpResolutionError};
88+
/// use torrust_tracker_lib::servers::http::v1::services::peer_ip_resolver::{invoke, ClientIpSources, PeerIpResolutionError};
8989
///
9090
/// let on_reverse_proxy = false;
9191
///

tests/common/logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::collections::VecDeque;
33
use std::io;
44
use std::sync::{Mutex, MutexGuard, Once, OnceLock};
55

6-
use torrust_tracker::bootstrap::logging::TraceStyle;
6+
use torrust_tracker_lib::bootstrap::logging::TraceStyle;
77
use tracing::level_filters::LevelFilter;
88
use tracing_subscriber::fmt::MakeWriter;
99

tests/servers/api/environment.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use std::sync::Arc;
33

44
use bittorrent_primitives::info_hash::InfoHash;
55
use futures::executor::block_on;
6-
use torrust_tracker::bootstrap::app::initialize_with_configuration;
7-
use torrust_tracker::bootstrap::jobs::make_rust_tls;
8-
use torrust_tracker::core::Tracker;
9-
use torrust_tracker::servers::apis::server::{ApiServer, Launcher, Running, Stopped};
10-
use torrust_tracker::servers::registar::Registar;
116
use torrust_tracker_configuration::{Configuration, HttpApi};
7+
use torrust_tracker_lib::bootstrap::app::initialize_with_configuration;
8+
use torrust_tracker_lib::bootstrap::jobs::make_rust_tls;
9+
use torrust_tracker_lib::core::Tracker;
10+
use torrust_tracker_lib::servers::apis::server::{ApiServer, Launcher, Running, Stopped};
11+
use torrust_tracker_lib::servers::registar::Registar;
1212
use torrust_tracker_primitives::peer;
1313

1414
use super::connection_info::ConnectionInfo;

tests/servers/api/mod.rs

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

3-
use torrust_tracker::core::Tracker;
4-
use torrust_tracker::servers::apis::server;
3+
use torrust_tracker_lib::core::Tracker;
4+
use torrust_tracker_lib::servers::apis::server;
55

66
pub mod connection_info;
77
pub mod environment;

tests/servers/api/v1/asserts.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// code-review: should we use macros to return the exact line where the assert fails?
22

33
use reqwest::Response;
4-
use torrust_tracker::servers::apis::v1::context::auth_key::resources::AuthKey;
5-
use torrust_tracker::servers::apis::v1::context::stats::resources::Stats;
6-
use torrust_tracker::servers::apis::v1::context::torrent::resources::torrent::{ListItem, Torrent};
4+
use torrust_tracker_lib::servers::apis::v1::context::auth_key::resources::AuthKey;
5+
use torrust_tracker_lib::servers::apis::v1::context::stats::resources::Stats;
6+
use torrust_tracker_lib::servers::apis::v1::context::torrent::resources::torrent::{ListItem, Torrent};
77

88
// Resource responses
99

tests/servers/api/v1/contract/context/auth_key.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::time::Duration;
22

33
use serde::Serialize;
4-
use torrust_tracker::core::auth::Key;
4+
use torrust_tracker_lib::core::auth::Key;
55
use torrust_tracker_test_helpers::configuration;
66
use uuid::Uuid;
77

@@ -462,7 +462,7 @@ async fn should_not_allow_reloading_keys_for_unauthenticated_users() {
462462

463463
mod deprecated_generate_key_endpoint {
464464

465-
use torrust_tracker::core::auth::Key;
465+
use torrust_tracker_lib::core::auth::Key;
466466
use torrust_tracker_test_helpers::configuration;
467467
use uuid::Uuid;
468468

tests/servers/api/v1/contract/context/health_check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use torrust_tracker::servers::apis::v1::context::health_check::resources::{Report, Status};
1+
use torrust_tracker_lib::servers::apis::v1::context::health_check::resources::{Report, Status};
22
use torrust_tracker_test_helpers::configuration;
33

44
use crate::common::logging;

tests/servers/api/v1/contract/context/stats.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::str::FromStr;
22

33
use bittorrent_primitives::info_hash::InfoHash;
4-
use torrust_tracker::servers::apis::v1::context::stats::resources::Stats;
4+
use torrust_tracker_lib::servers::apis::v1::context::stats::resources::Stats;
55
use torrust_tracker_primitives::peer::fixture::PeerBuilder;
66
use torrust_tracker_test_helpers::configuration;
77
use uuid::Uuid;

tests/servers/api/v1/contract/context/torrent.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::str::FromStr;
22

33
use bittorrent_primitives::info_hash::InfoHash;
4-
use torrust_tracker::servers::apis::v1::context::torrent::resources::peer::Peer;
5-
use torrust_tracker::servers::apis::v1::context::torrent::resources::torrent::{self, Torrent};
4+
use torrust_tracker_lib::servers::apis::v1::context::torrent::resources::peer::Peer;
5+
use torrust_tracker_lib::servers::apis::v1::context::torrent::resources::torrent::{self, Torrent};
66
use torrust_tracker_primitives::peer::fixture::PeerBuilder;
77
use torrust_tracker_test_helpers::configuration;
88
use uuid::Uuid;

tests/servers/health_check_api/contract.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use torrust_tracker::servers::health_check_api::resources::{Report, Status};
2-
use torrust_tracker::servers::registar::Registar;
1+
use torrust_tracker_lib::servers::health_check_api::resources::{Report, Status};
2+
use torrust_tracker_lib::servers::registar::Registar;
33
use torrust_tracker_test_helpers::configuration;
44

55
use crate::common::logging;
@@ -32,7 +32,7 @@ async fn health_check_endpoint_should_return_status_ok_when_there_is_no_services
3232
mod api {
3333
use std::sync::Arc;
3434

35-
use torrust_tracker::servers::health_check_api::resources::{Report, Status};
35+
use torrust_tracker_lib::servers::health_check_api::resources::{Report, Status};
3636
use torrust_tracker_test_helpers::configuration;
3737

3838
use crate::common::logging;
@@ -142,7 +142,7 @@ mod api {
142142
mod http {
143143
use std::sync::Arc;
144144

145-
use torrust_tracker::servers::health_check_api::resources::{Report, Status};
145+
use torrust_tracker_lib::servers::health_check_api::resources::{Report, Status};
146146
use torrust_tracker_test_helpers::configuration;
147147

148148
use crate::common::logging;
@@ -251,7 +251,7 @@ mod http {
251251
mod udp {
252252
use std::sync::Arc;
253253

254-
use torrust_tracker::servers::health_check_api::resources::{Report, Status};
254+
use torrust_tracker_lib::servers::health_check_api::resources::{Report, Status};
255255
use torrust_tracker_test_helpers::configuration;
256256

257257
use crate::common::logging;

tests/servers/health_check_api/environment.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::sync::Arc;
33

44
use tokio::sync::oneshot::{self, Sender};
55
use tokio::task::JoinHandle;
6-
use torrust_tracker::bootstrap::jobs::Started;
7-
use torrust_tracker::servers::health_check_api::{server, HEALTH_CHECK_API_LOG_TARGET};
8-
use torrust_tracker::servers::registar::Registar;
9-
use torrust_tracker::servers::signals::{self, Halted};
106
use torrust_tracker_configuration::HealthCheckApi;
7+
use torrust_tracker_lib::bootstrap::jobs::Started;
8+
use torrust_tracker_lib::servers::health_check_api::{server, HEALTH_CHECK_API_LOG_TARGET};
9+
use torrust_tracker_lib::servers::registar::Registar;
10+
use torrust_tracker_lib::servers::signals::{self, Halted};
1111

1212
#[derive(Debug)]
1313
pub enum Error {

tests/servers/http/client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::net::IpAddr;
22

33
use reqwest::{Client as ReqwestClient, Response};
4-
use torrust_tracker::core::auth::Key;
4+
use torrust_tracker_lib::core::auth::Key;
55

66
use super::requests::announce::{self, Query};
77
use super::requests::scrape;

tests/servers/http/connection_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use torrust_tracker::core::auth::Key;
1+
use torrust_tracker_lib::core::auth::Key;
22

33
#[derive(Clone, Debug)]
44
pub struct ConnectionInfo {

tests/servers/http/environment.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use std::sync::Arc;
22

33
use bittorrent_primitives::info_hash::InfoHash;
44
use futures::executor::block_on;
5-
use torrust_tracker::bootstrap::app::initialize_with_configuration;
6-
use torrust_tracker::bootstrap::jobs::make_rust_tls;
7-
use torrust_tracker::core::Tracker;
8-
use torrust_tracker::servers::http::server::{HttpServer, Launcher, Running, Stopped};
9-
use torrust_tracker::servers::registar::Registar;
105
use torrust_tracker_configuration::{Configuration, HttpTracker};
6+
use torrust_tracker_lib::bootstrap::app::initialize_with_configuration;
7+
use torrust_tracker_lib::bootstrap::jobs::make_rust_tls;
8+
use torrust_tracker_lib::core::Tracker;
9+
use torrust_tracker_lib::servers::http::server::{HttpServer, Launcher, Running, Stopped};
10+
use torrust_tracker_lib::servers::registar::Registar;
1111
use torrust_tracker_primitives::peer;
1212

1313
pub struct Environment<S> {

tests/servers/http/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub mod v1;
88
pub type Started = environment::Environment<server::Running>;
99

1010
use percent_encoding::NON_ALPHANUMERIC;
11-
use torrust_tracker::servers::http::server;
11+
use torrust_tracker_lib::servers::http::server;
1212

1313
pub type ByteArray20 = [u8; 20];
1414

tests/servers/http/v1/contract.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async fn environment_should_be_started_and_stopped() {
1414

1515
mod for_all_config_modes {
1616

17-
use torrust_tracker::servers::http::v1::handlers::health_check::{Report, Status};
17+
use torrust_tracker_lib::servers::http::v1::handlers::health_check::{Report, Status};
1818
use torrust_tracker_test_helpers::configuration;
1919

2020
use crate::common::logging;
@@ -1381,7 +1381,7 @@ mod configured_as_private {
13811381
use std::time::Duration;
13821382

13831383
use bittorrent_primitives::info_hash::InfoHash;
1384-
use torrust_tracker::core::auth::Key;
1384+
use torrust_tracker_lib::core::auth::Key;
13851385
use torrust_tracker_test_helpers::configuration;
13861386

13871387
use crate::common::logging;
@@ -1467,7 +1467,7 @@ mod configured_as_private {
14671467

14681468
use aquatic_udp_protocol::PeerId;
14691469
use bittorrent_primitives::info_hash::InfoHash;
1470-
use torrust_tracker::core::auth::Key;
1470+
use torrust_tracker_lib::core::auth::Key;
14711471
use torrust_tracker_primitives::peer::fixture::PeerBuilder;
14721472
use torrust_tracker_test_helpers::configuration;
14731473

0 commit comments

Comments
 (0)