primitives - sentry - Event::Impression.publisher - use ValidatorId

Author: elpiel

primitives/src/sentry.rs

@@ -32,7 +32,7 @@ pub struct ApproveStateValidatorMessage {
 pub enum Event {
     #[serde(rename_all = "camelCase")]
     Impression {
-        publisher: String,
+        publisher: ValidatorId,
         ad_unit: Option<String>,
     },
     Click {

sentry/src/access.rs

@@ -188,10 +188,11 @@ mod test {
 
         channel
     }
+
     fn get_impression_events(count: i8) -> Vec<Event> {
         (0..count)
             .map(|_| Event::Impression {
-                publisher: "working".to_string(),
+                publisher: IDS["publisher2"].clone(),
                 ad_unit: None,
             })
             .collect()

sentry/src/event_reducer.rs

@@ -1,5 +1,5 @@
 use primitives::sentry::{AggregateEvents, Event, EventAggregate};
-use primitives::Channel;
+use primitives::{Channel, ValidatorId};
 
 // @TODO: Remove attribute once we use this function!
 #[allow(dead_code)]
@@ -13,7 +13,7 @@ pub(crate) fn reduce(channel: &Channel, initial_aggr: &mut EventAggregate, ev: &
             initial_aggr.events.insert("IMPRESSION".to_owned(), merge);
         }
         Event::Close => {
-            let creator = channel.creator.to_string();
+            let creator = channel.creator.clone();
             let close_event = AggregateEvents {
                 event_counts: Some(vec![(creator.clone(), 1.into())].into_iter().collect()),
                 event_payouts: vec![(creator, channel.deposit_amount.clone())]
@@ -28,22 +28,22 @@ pub(crate) fn reduce(channel: &Channel, initial_aggr: &mut EventAggregate, ev: &
 
 fn merge_impression_ev(
     impression: Option<&AggregateEvents>,
-    earner: &str,
+    earner: &ValidatorId,
     channel: &Channel,
 ) -> AggregateEvents {
     let mut impression = impression.map(Clone::clone).unwrap_or_default();
 
     let event_count = impression
         .event_counts
         .get_or_insert_with(Default::default)
-        .entry(earner.to_string())
+        .entry(earner.clone())
         .or_insert_with(|| 0.into());
 
     *event_count += &1.into();
 
     let event_payouts = impression
         .event_payouts
-        .entry(earner.to_string())
+        .entry(earner.clone())
         .or_insert_with(|| 0.into());
     *event_payouts += &channel.spec.min_per_impression;
 
@@ -54,7 +54,7 @@ fn merge_impression_ev(
 mod test {
     use super::*;
     use chrono::Utc;
-    use primitives::util::tests::prep_db::DUMMY_CHANNEL;
+    use primitives::util::tests::prep_db::{DUMMY_CHANNEL, IDS};
     use primitives::BigNum;
 
     #[test]
@@ -71,7 +71,7 @@ mod test {
         };
 
         let event = Event::Impression {
-            publisher: "myAwesomePublisher".to_string(),
+            publisher: IDS["publisher"].clone(),
             ad_unit: None,
         };
 
@@ -90,15 +90,15 @@ mod test {
             .event_counts
             .as_ref()
             .expect("there should be event_counts set")
-            .get("myAwesomePublisher")
+            .get(&IDS["publisher"])
             .expect("There should be myAwesomePublisher event_counts key");
         assert_eq!(event_counts, &BigNum::from(101));
 
         let event_payouts = impression_event
             .event_counts
             .as_ref()
             .expect("there should be event_counts set")
-            .get("myAwesomePublisher")
+            .get(&IDS["publisher"])
             .expect("There should be myAwesomePublisher event_payouts key");
         assert_eq!(event_payouts, &BigNum::from(101));
     }