refactor: [#950] move DatabaseDriver to databases mod

Author: josecelano

packages/primitives/src/lib.rs

@@ -42,20 +42,4 @@ pub enum IPVersion {
 #[derive(Hash, Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct NumberOfBytes(pub i64);
 
-/// The database management system used by the tracker.
-///
-/// Refer to:
-///
-/// - [Torrust Tracker Configuration](https://docs.rs/torrust-tracker-configuration).
-/// - [Torrust Tracker](https://docs.rs/torrust-tracker).
-///
-/// For more information about persistence.
-#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, derive_more::Display, Clone)]
-pub enum DatabaseDriver {
-    /// The Sqlite3 database driver.
-    Sqlite3,
-    /// The `MySQL` database driver.
-    MySQL,
-}
-
 pub type PersistentTorrents = BTreeMap<InfoHash, u32>;

src/core/databases/driver.rs

@@ -2,20 +2,37 @@
 //!
 //! See [`databases::driver::build`](crate::core::databases::driver::build)
 //! function for more information.
-use torrust_tracker_primitives::DatabaseDriver;
+use serde::{Deserialize, Serialize};
 
 use super::error::Error;
 use super::mysql::Mysql;
 use super::sqlite::Sqlite;
 use super::{Builder, Database};
 
+/// The database management system used by the tracker.
+///
+/// Refer to:
+///
+/// - [Torrust Tracker Configuration](https://docs.rs/torrust-tracker-configuration).
+/// - [Torrust Tracker](https://docs.rs/torrust-tracker).
+///
+/// For more information about persistence.
+#[allow(clippy::module_name_repetitions)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug, derive_more::Display, Clone)]
+pub enum DatabaseDriver {
+    /// The Sqlite3 database driver.
+    Sqlite3,
+    /// The `MySQL` database driver.
+    MySQL,
+}
+
 /// It builds a new database driver.
 ///
 /// Example for `SQLite3`:
 ///
 /// ```rust,no_run
 /// use torrust_tracker::core::databases;
-/// use torrust_tracker_primitives::DatabaseDriver;
+/// use torrust_tracker::core::databases::driver::DatabaseDriver;
 ///
 /// let db_driver = DatabaseDriver::Sqlite3;
 /// let db_path = "./storage/tracker/lib/database/sqlite3.db".to_string();
@@ -26,7 +43,7 @@ use super::{Builder, Database};
 ///
 /// ```rust,no_run
 /// use torrust_tracker::core::databases;
-/// use torrust_tracker_primitives::DatabaseDriver;
+/// use torrust_tracker::core::databases::driver::DatabaseDriver;
 ///
 /// let db_driver = DatabaseDriver::MySQL;
 /// let db_path = "mysql://db_user:db_user_secret_password@mysql:3306/torrust_tracker".to_string();

src/core/databases/error.rs

@@ -6,7 +6,8 @@ use std::sync::Arc;
 
 use r2d2_mysql::mysql::UrlError;
 use torrust_tracker_located_error::{DynError, Located, LocatedError};
-use torrust_tracker_primitives::DatabaseDriver;
+
+use super::driver::DatabaseDriver;
 
 #[derive(thiserror::Error, Debug, Clone)]
 pub enum Error {

src/core/databases/mysql.rs

@@ -8,9 +8,10 @@ use r2d2_mysql::mysql::prelude::Queryable;
 use r2d2_mysql::mysql::{params, Opts, OptsBuilder};
 use r2d2_mysql::MySqlConnectionManager;
 use torrust_tracker_primitives::info_hash::InfoHash;
-use torrust_tracker_primitives::{DatabaseDriver, PersistentTorrents};
+use torrust_tracker_primitives::PersistentTorrents;
 use tracing::debug;
 
+use super::driver::DatabaseDriver;
 use super::{Database, Error};
 use crate::core::auth::{self, Key};
 use crate::shared::bit_torrent::common::AUTH_KEY_LENGTH;

src/core/databases/sqlite.rs

@@ -6,8 +6,9 @@ use async_trait::async_trait;
 use r2d2::Pool;
 use r2d2_sqlite::SqliteConnectionManager;
 use torrust_tracker_primitives::info_hash::InfoHash;
-use torrust_tracker_primitives::{DatabaseDriver, DurationSinceUnixEpoch, PersistentTorrents};
+use torrust_tracker_primitives::{DurationSinceUnixEpoch, PersistentTorrents};
 
+use super::driver::DatabaseDriver;
 use super::{Database, Error};
 use crate::core::auth::{self, Key};
 

src/core/mod.rs

@@ -453,15 +453,16 @@ use std::panic::Location;
 use std::sync::Arc;
 use std::time::Duration;
 
+use databases::driver::DatabaseDriver;
 use derive_more::Constructor;
 use tokio::sync::mpsc::error::SendError;
 use torrust_tracker_clock::clock::Time;
 use torrust_tracker_configuration::v2::database;
 use torrust_tracker_configuration::{AnnouncePolicy, Core, TORRENT_PEERS_LIMIT};
 use torrust_tracker_primitives::info_hash::InfoHash;
+use torrust_tracker_primitives::peer;
 use torrust_tracker_primitives::swarm_metadata::SwarmMetadata;
 use torrust_tracker_primitives::torrent_metrics::TorrentsMetrics;
-use torrust_tracker_primitives::{peer, DatabaseDriver};
 use torrust_tracker_torrent_repository::entry::EntrySync;
 use torrust_tracker_torrent_repository::repository::Repository;
 use tracing::debug;