Skip to content

Commit c34b665

Browse files
committed
Merge #756: Refactor: extract duplicate implementation of InfoHash struct
569fbd2 chore: remove unused dep binascii (Jose Celano) e58b314 refactor: replace InfoHash with external extracted crate (Jose Celano) 912715f feat: add dep bittorrent-primitives (Jose Celano) Pull request description: Relates to: - torrust/torrust-tracker#360 - torrust/torrust-tracker#1066 The `InfoHash` type was duplicated here and in the [Tracker](torrust/torrust-tracker#360). I've extracted it into a new crate: https://github.com/torrust/bittorrent-primitives ACKs for top commit: josecelano: ACK 569fbd2 Tree-SHA512: a09f849555067a08efe4609c68d38ca690ef7d3d795b81deeb3b6aa8f2cfa235082620745835f26155b80076a78f23c8eb99f46dbfb46a5da67a9c8b54c64691
2 parents 65f108d + 569fbd2 commit c34b665

File tree

13 files changed

+102
-507
lines changed

13 files changed

+102
-507
lines changed

Cargo.lock

+90-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ argon2 = "0"
4040
async-trait = "0"
4141
axum = { version = "0", features = ["multipart"] }
4242
axum-server = { version = "0", features = ["tls-rustls"] }
43-
binascii = "0"
43+
bittorrent-primitives = "0.1.0"
4444
bytes = "1"
4545
camino = { version = "1", features = ["serde"] }
4646
casbin = "2"
@@ -102,7 +102,7 @@ tempfile = "3"
102102
which = "6"
103103

104104
[package.metadata.cargo-machete]
105-
ignored = ["sha-1", "futures"]
105+
ignored = ["futures", "sha-1"]
106106

107107
[lints.clippy]
108108
complexity = { level = "deny", priority = -1 }

src/databases/database.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use async_trait::async_trait;
2+
use bittorrent_primitives::info_hash::InfoHash;
23
use chrono::{DateTime, NaiveDateTime, Utc};
34
use serde::{Deserialize, Serialize};
45
use url::Url;
56

67
use crate::databases::mysql::Mysql;
78
use crate::databases::sqlite::Sqlite;
89
use crate::models::category::CategoryId;
9-
use crate::models::info_hash::InfoHash;
1010
use crate::models::response::TorrentsResponse;
1111
use crate::models::torrent::{Metadata, TorrentListing};
1212
use crate::models::torrent_file::{DbTorrent, Torrent, TorrentFile};

src/databases/mysql.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::str::FromStr;
22
use std::time::Duration;
33

44
use async_trait::async_trait;
5+
use bittorrent_primitives::info_hash::InfoHash;
56
use chrono::{DateTime, NaiveDateTime, Utc};
67
use sqlx::mysql::{MySqlConnectOptions, MySqlPoolOptions};
78
use sqlx::{query, query_as, Acquire, ConnectOptions, MySqlPool};
@@ -11,7 +12,6 @@ use super::database::TABLES_TO_TRUNCATE;
1112
use crate::databases::database;
1213
use crate::databases::database::{Category, Database, Driver, Sorting, TorrentCompact};
1314
use crate::models::category::CategoryId;
14-
use crate::models::info_hash::InfoHash;
1515
use crate::models::response::TorrentsResponse;
1616
use crate::models::torrent::{Metadata, TorrentListing};
1717
use crate::models::torrent_file::{

src/databases/sqlite.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::str::FromStr;
22
use std::time::Duration;
33

44
use async_trait::async_trait;
5+
use bittorrent_primitives::info_hash::InfoHash;
56
use chrono::{DateTime, NaiveDateTime, Utc};
67
use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
78
use sqlx::{query, query_as, Acquire, ConnectOptions, SqlitePool};
@@ -11,7 +12,6 @@ use super::database::TABLES_TO_TRUNCATE;
1112
use crate::databases::database;
1213
use crate::databases::database::{Category, Database, Driver, Sorting, TorrentCompact};
1314
use crate::models::category::CategoryId;
14-
use crate::models::info_hash::InfoHash;
1515
use crate::models::response::TorrentsResponse;
1616
use crate::models::torrent::{Metadata, TorrentListing};
1717
use crate::models::torrent_file::{

0 commit comments

Comments
 (0)