Fix Clippy Pedantic Warnings and Structure Rename

.github/workflows/test_build_release.yml

@@ -45,7 +45,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets
+          args: --all-targets -- -D clippy::pedantic
       - uses: taiki-e/install-action@cargo-llvm-cov
       - uses: taiki-e/install-action@nextest
       - name: Run Tests

.vscode/settings.json

@@ -3,4 +3,6 @@
         "editor.formatOnSave": true
     },
     "rust-analyzer.checkOnSave.command": "clippy",
+    "rust-analyzer.checkOnSave.allTargets": true,
+    "rust-analyzer.checkOnSave.extraArgs": ["--","-W","clippy::pedantic"],
 }

cSpell.json

@@ -7,6 +7,7 @@
         "bencode",
         "binascii",
         "Bitflu",
+        "bools",
         "bufs",
         "byteorder",
         "canonicalize",

src/api/mod.rs

@@ -1,2 +1,2 @@
-pub mod resources;
+pub mod resource;
 pub mod server;

src/api/resources/auth_key_resource.rs → src/api/resource/auth_key.rs

@@ -2,18 +2,18 @@ use std::convert::From;
 
 use serde::{Deserialize, Serialize};
 
-use crate::key::AuthKey;
 use crate::protocol::clock::DurationSinceUnixEpoch;
+use crate::tracker::auth;
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct AuthKeyResource {
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct AuthKey {
     pub key: String,
     pub valid_until: Option<u64>,
 }
 
-impl From<AuthKeyResource> for AuthKey {
-    fn from(auth_key_resource: AuthKeyResource) -> Self {
-        AuthKey {
+impl From<AuthKey> for auth::Key {
+    fn from(auth_key_resource: AuthKey) -> Self {
+        auth::Key {
             key: auth_key_resource.key,
             valid_until: auth_key_resource
                 .valid_until
@@ -22,9 +22,9 @@ impl From<AuthKeyResource> for AuthKey {
     }
 }
 
-impl From<AuthKey> for AuthKeyResource {
-    fn from(auth_key: AuthKey) -> Self {
-        AuthKeyResource {
+impl From<auth::Key> for AuthKey {
+    fn from(auth_key: auth::Key) -> Self {
+        AuthKey {
             key: auth_key.key,
             valid_until: auth_key.valid_until.map(|valid_until| valid_until.as_secs()),
         }
@@ -35,50 +35,50 @@ impl From<AuthKey> for AuthKeyResource {
 mod tests {
     use std::time::Duration;
 
-    use super::AuthKeyResource;
-    use crate::key::AuthKey;
-    use crate::protocol::clock::{DefaultClock, TimeNow};
+    use super::AuthKey;
+    use crate::protocol::clock::{Current, TimeNow};
+    use crate::tracker::auth;
 
     #[test]
     fn it_should_be_convertible_into_an_auth_key() {
         let duration_in_secs = 60;
 
-        let auth_key_resource = AuthKeyResource {
+        let auth_key_resource = AuthKey {
             key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".to_string(), // cspell:disable-line
             valid_until: Some(duration_in_secs),
         };
 
         assert_eq!(
-            AuthKey::from(auth_key_resource),
-            AuthKey {
+            auth::Key::from(auth_key_resource),
+            auth::Key {
                 key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".to_string(), // cspell:disable-line
-                valid_until: Some(DefaultClock::add(&Duration::new(duration_in_secs, 0)).unwrap())
+                valid_until: Some(Current::add(&Duration::new(duration_in_secs, 0)).unwrap())
             }
-        )
+        );
     }
 
     #[test]
     fn it_should_be_convertible_from_an_auth_key() {
         let duration_in_secs = 60;
 
-        let auth_key = AuthKey {
+        let auth_key = auth::Key {
             key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".to_string(), // cspell:disable-line
-            valid_until: Some(DefaultClock::add(&Duration::new(duration_in_secs, 0)).unwrap()),
+            valid_until: Some(Current::add(&Duration::new(duration_in_secs, 0)).unwrap()),
         };
 
         assert_eq!(
-            AuthKeyResource::from(auth_key),
-            AuthKeyResource {
+            AuthKey::from(auth_key),
+            AuthKey {
                 key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".to_string(), // cspell:disable-line
                 valid_until: Some(duration_in_secs)
             }
-        )
+        );
     }
 
     #[test]
     fn it_should_be_convertible_into_json() {
         assert_eq!(
-            serde_json::to_string(&AuthKeyResource {
+            serde_json::to_string(&AuthKey {
                 key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".to_string(), // cspell:disable-line
                 valid_until: Some(60)
             })

src/api/resource/mod.rs

@@ -0,0 +1,13 @@
+//! These are the Rest API resources.
+//!
+//! WIP. Not all endpoints have their resource structs.
+//!
+//! - [x] `AuthKeys`
+//! - [ ] `Torrent`, `ListItem`, `Peer`, `PeerId`
+//! - [ ] `StatsResource`
+//! - [ ] ...
+
+pub mod auth_key;
+pub mod peer;
+pub mod stats;
+pub mod torrent;

src/api/resource/peer.rs

@@ -0,0 +1,47 @@
+use serde::{Deserialize, Serialize};
+
+use crate::tracker;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct Peer {
+    pub peer_id: Id,
+    pub peer_addr: String,
+    #[deprecated(since = "2.0.0", note = "please use `updated_milliseconds_ago` instead")]
+    pub updated: u128,
+    pub updated_milliseconds_ago: u128,
+    pub uploaded: i64,
+    pub downloaded: i64,
+    pub left: i64,
+    pub event: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct Id {
+    pub id: Option<String>,
+    pub client: Option<String>,
+}
+
+impl From<tracker::peer::Id> for Id {
+    fn from(peer_id: tracker::peer::Id) -> Self {
+        Id {
+            id: peer_id.get_id(),
+            client: peer_id.get_client_name().map(std::string::ToString::to_string),
+        }
+    }
+}
+
+impl From<tracker::peer::Peer> for Peer {
+    #[allow(deprecated)]
+    fn from(peer: tracker::peer::Peer) -> Self {
+        Peer {
+            peer_id: Id::from(peer.peer_id),
+            peer_addr: peer.peer_addr.to_string(),
+            updated: peer.updated.as_millis(),
+            updated_milliseconds_ago: peer.updated.as_millis(),
+            uploaded: peer.uploaded.0,
+            downloaded: peer.downloaded.0,
+            left: peer.left.0,
+            event: format!("{:?}", peer.event),
+        }
+    }
+}

src/api/resources/stats_resource.rs → src/api/resource/stats.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct StatsResource {
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct Stats {
     pub torrents: u32,
     pub seeders: u32,
     pub completed: u32,

src/api/resource/torrent.rs

@@ -0,0 +1,21 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct Torrent {
+    pub info_hash: String,
+    pub seeders: u32,
+    pub completed: u32,
+    pub leechers: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub peers: Option<Vec<super::peer::Peer>>,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+pub struct ListItem {
+    pub info_hash: String,
+    pub seeders: u32,
+    pub completed: u32,
+    pub leechers: u32,
+    // todo: this is always None. Remove field from endpoint?
+    pub peers: Option<Vec<super::peer::Peer>>,
+}