primitives - sentry - EventType fix

- rustfmt & clippy fixes

Author: elpiel

adview-manager/Cargo.toml

@@ -11,7 +11,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 # Domain
-adex_primitives = { version="0.2.0", path = "../primitives", package = "primitives" }
+adex_primitives = { version = "0.2.0", path = "../primitives", package = "primitives" }
 chrono = "0.4"
 num-integer = "0.1"
 # (De)Serialization & Http requests
@@ -30,5 +30,4 @@ rand = "0.8"
 
 [dev-dependencies]
 # enable the `test-util` only in dev
-adex_primitives = { version="0.2.0", path = "../primitives", package = "primitives", features = ["test-util"] }
-
+adex_primitives = { version = "0.2.0", path = "../primitives", package = "primitives", features = ["test-util"] }

adview-manager/serve/src/app.rs

@@ -1,11 +1,11 @@
-use std::{sync::Arc, net::SocketAddr};
+use std::{net::SocketAddr, sync::Arc};
 
 use axum::{routing::get, Extension, Router, Server};
 use log::info;
 
 use tera::Tera;
 
-use crate::routes::{get_preview_ad, get_index, get_preview_video};
+use crate::routes::{get_index, get_preview_ad, get_preview_video};
 
 #[derive(Debug)]
 pub struct State {

adview-manager/serve/src/lib.rs

@@ -1,2 +1,2 @@
 pub mod app;
-pub mod routes;
+pub mod routes;

primitives/src/sentry.rs

@@ -133,7 +133,10 @@ mod event {
     use once_cell::sync::Lazy;
     use parse_display::{Display, FromStr};
     use serde::{Deserialize, Serialize};
-    use std::fmt;
+    use std::{
+        fmt,
+        hash::{Hash, Hasher},
+    };
 
     use crate::{Address, IPFS};
 
@@ -145,20 +148,7 @@ mod event {
     static IMPRESSION_STRING: Lazy<String> = Lazy::new(|| EventType::Impression.to_string());
     static CLICK_STRING: Lazy<String> = Lazy::new(|| EventType::Click.to_string());
 
-    #[derive(
-        Debug,
-        Display,
-        FromStr,
-        Serialize,
-        Deserialize,
-        Hash,
-        Ord,
-        Eq,
-        PartialEq,
-        PartialOrd,
-        Clone,
-        Copy,
-    )]
+    #[derive(Debug, Display, FromStr, Serialize, Deserialize, Ord, Eq, PartialOrd, Clone, Copy)]
     #[display(style = "SNAKE_CASE")]
     #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
     pub enum EventType {
@@ -175,9 +165,24 @@ mod event {
         }
     }
 
+    /// Due to the fact that we want to impl `Borrow<str>`
+    /// we must provide custom hash impl using the capitalized
+    /// version of the [`EventType`] as a string.
+    impl Hash for EventType {
+        fn hash<H: Hasher>(&self, state: &mut H) {
+            self.as_str().hash(state);
+        }
+    }
+
+    impl PartialEq for EventType {
+        fn eq(&self, other: &Self) -> bool {
+            self.as_str() == other.as_str()
+        }
+    }
+
     impl std::borrow::Borrow<str> for EventType {
         fn borrow(&self) -> &str {
-            &self.as_str()
+            self.as_str()
         }
     }
 
@@ -187,6 +192,7 @@ mod event {
         }
     }
 
+    /// All the [`Event`]s available in the validator stack.
     #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash)]
     #[serde(tag = "type", rename_all = "SCREAMING_SNAKE_CASE")]
     pub enum Event {
@@ -250,12 +256,14 @@ mod event {
 
     #[cfg(test)]
     mod test {
+        use std::borrow::Borrow;
+
         use crate::sentry::event::{CLICK_STRING, IMPRESSION_STRING};
 
         use super::EventType;
 
         #[test]
-        fn event_type_parsing_and_de_serialization() {
+        fn test_event_type_parsing_and_de_serialization() {
             let impression_parse = "IMPRESSION"
                 .parse::<EventType>()
                 .expect("Should parse IMPRESSION");
@@ -273,6 +281,8 @@ mod event {
             assert_eq!(EventType::Impression, impression_json);
             assert_eq!(EventType::Click, click_parse);
             assert_eq!(EventType::Click, click_json);
+
+            assert_eq!(Borrow::<str>::borrow(&EventType::Impression), "IMPRESSION");
         }
     }
 }

primitives/src/targeting.rs

@@ -84,7 +84,7 @@ mod test {
         let output = Output {
             show: false,
             boost: 5.5,
-            price: vec![(IMPRESSION, 100.into())].into_iter().collect(),
+            price: [(IMPRESSION, 100.into())].into_iter().collect(),
         };
 
         assert_eq!(Ok(Value::Bool(false)), output.try_get("show"));

sentry/src/payout.rs

@@ -65,17 +65,15 @@ pub fn get_payout(
                 let mut output = Output {
                     show: true,
                     boost: 1.0,
-                    price: vec![(event_type.to_string(), pricing.min)]
-                        .into_iter()
-                        .collect(),
+                    price: [(event_type, pricing.min)].into_iter().collect(),
                 };
 
                 let on_type_error = |error, rule| error!(logger, "Rule evaluation error for {:?}", campaign.id; "error" => ?error, "rule" => ?rule);
 
                 eval_with_callback(&targeting_rules, &input, &mut output, Some(on_type_error));
 
                 if output.show {
-                    let price = match output.price.get(event_type.as_str()) {
+                    let price = match output.price.get(&event_type) {
                         Some(output_price) => max(pricing.min, min(pricing.max, *output_price)),
                         None => max(pricing.min, pricing.max),
                     };

sentry/src/routes/routers.rs

@@ -404,10 +404,7 @@ mod analytics_router_test {
             query::{AllowedKey, Time},
             AnalyticsQuery, Metric, OperatingSystem, Timeframe,
         },
-        sentry::{
-            AnalyticsResponse, DateHour, FetchedAnalytics, FetchedMetric, UpdateAnalytics, CLICK,
-            IMPRESSION,
-        },
+        sentry::{AnalyticsResponse, DateHour, FetchedMetric, UpdateAnalytics, CLICK, IMPRESSION},
         test_util::{ADVERTISER, DUMMY_CAMPAIGN, DUMMY_IPFS, IDS, LEADER, PUBLISHER, PUBLISHER_2},
         UnifiedNum,
     };

sentry/src/routes/units_for_slot.rs

@@ -357,7 +357,7 @@ async fn apply_targeting(
                                 show: true,
                                 boost: 1.0,
                                 // only "IMPRESSION" event can be used for this `Output`
-                                price: vec![(IMPRESSION.into(), pricing_bounds.min)]
+                                price: [(IMPRESSION, pricing_bounds.min)]
                                     .into_iter()
                                     .collect(),
                             };