dev: vairous fixups

Author: da2ce7

packages/primitives/src/info_hash.rs

@@ -73,7 +73,7 @@ impl Ord for InfoHash {
     }
 }
 
-impl std::cmp::PartialOrd<InfoHash> for InfoHash {
+impl PartialOrd<InfoHash> for InfoHash {
     fn partial_cmp(&self, other: &InfoHash) -> Option<std::cmp::Ordering> {
         Some(self.cmp(other))
     }

packages/primitives/src/lib.rs

@@ -18,13 +18,4 @@ pub mod torrent_metrics;
 /// Duration since the Unix Epoch.
 pub type DurationSinceUnixEpoch = Duration;
 
-/// IP version used by the peer to connect to the tracker: IPv4 or IPv6
-#[derive(PartialEq, Eq, Debug)]
-pub enum IPVersion {
-    /// <https://en.wikipedia.org/wiki/Internet_Protocol_version_4>
-    IPv4,
-    /// <https://en.wikipedia.org/wiki/IPv6>
-    IPv6,
-}
-
 pub type PersistentTorrents = BTreeMap<InfoHash, u32>;

packages/primitives/src/peer.rs

@@ -30,7 +30,7 @@ use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
 use serde::Serialize;
 use zerocopy::FromBytes as _;
 
-use crate::{DurationSinceUnixEpoch, IPVersion};
+use crate::DurationSinceUnixEpoch;
 
 /// Peer struct used by the core `Tracker`.
 ///
@@ -208,15 +208,6 @@ impl Peer {
     pub fn change_ip(&mut self, new_ip: &IpAddr) {
         self.peer_addr = SocketAddr::new(*new_ip, self.peer_addr.port());
     }
-
-    /// The IP version used by the peer: IPV4 or IPV6
-    #[must_use]
-    pub fn ip_version(&self) -> IPVersion {
-        if self.peer_addr.is_ipv4() {
-            return IPVersion::IPv4;
-        }
-        IPVersion::IPv6
-    }
 }
 
 use std::panic::Location;
@@ -264,22 +255,21 @@ impl DerefMut for Id {
     }
 }
 
-impl From<[u8; 20]> for Id {
-    fn from(bytes: [u8; 20]) -> Self {
-        let data = PeerId(bytes);
-        Self { data }
-    }
-}
-
-impl From<i32> for Id {
-    fn from(number: i32) -> Self {
+impl Id {
+    #[must_use]
+    pub fn new<T>(number: T) -> Self
+    where
+        T: Into<i128>,
+    {
+        let number: i128 = number.into();
         let number = number.to_le_bytes();
         let bytes = [
-            0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, number[0], number[1], number[2],
-            number[3],
+            0u8, 0u8, 0u8, 0u8, number[0], number[1], number[2], number[3], number[4], number[5], number[6], number[7],
+            number[8], number[9], number[10], number[11], number[12], number[13], number[14], number[15],
         ];
 
-        Id::from(bytes)
+        let data = PeerId(bytes);
+        Id { data }
     }
 }
 

packages/torrent-repository/tests/common/torrent_peer_builder.rs

@@ -69,7 +69,7 @@ impl TorrentPeerBuilder {
 /// has not announced it has stopped
 #[must_use]
 pub fn a_completed_peer(id: i32) -> peer::Peer {
-    let peer_id = peer::Id::from(id);
+    let peer_id = peer::Id::new(id);
     TorrentPeerBuilder::new()
         .with_number_of_bytes_left(0)
         .with_event_completed()
@@ -81,7 +81,7 @@ pub fn a_completed_peer(id: i32) -> peer::Peer {
 /// Leecher: left > 0 OR event = Stopped
 #[must_use]
 pub fn a_started_peer(id: i32) -> peer::Peer {
-    let peer_id = peer::Id::from(id);
+    let peer_id = peer::Id::new(id);
     TorrentPeerBuilder::new()
         .with_number_of_bytes_left(1)
         .with_event_started()

packages/torrent-repository/tests/entry/mod.rs

@@ -400,7 +400,7 @@ async fn it_should_limit_the_number_of_peers_returned(
     // We add one more peer than the scrape limit
     for peer_number in 1..=74 + 1 {
         let mut peer = a_started_peer(1);
-        peer.peer_id = *peer::Id::from(peer_number);
+        peer.peer_id = *peer::Id::new(peer_number);
         torrent.upsert_peer(&peer).await;
     }