fixes, formatting and clippy around:

elpiel · elpiel · commit e13393492414 · 2022-04-05T14:22:36.000+03:00
- changes on targeting input
- Event ad_unit &amp; ad_slot
- analytics
diff --git a/adview-manager/serve/src/main.rs b/adview-manager/serve/src/main.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use adex_primitives::{
+    sentry::IMPRESSION,
     supermarket::units_for_slot,
     targeting::{input::Global, Input},
     test_util::{DUMMY_CAMPAIGN, DUMMY_IPFS},
@@ -77,11 +78,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 targeting_input_base: Input {
                     ad_view: None,
                     global: Global {
-                        ad_slot_id: options.market_slot.to_string(),
+                        ad_slot_id: options.market_slot,
                         ad_slot_type: "".into(),
                         publisher_id: publisher_addr,
                         country: Some("Bulgaria".into()),
-                        event_type: "IMPRESSION".into(),
+                        event_type: IMPRESSION,
                         seconds_since_epoch: Utc::now(),
                         user_agent_os: None,
                         user_agent_browser_family: None,
diff --git a/primitives/src/ad_slot.rs b/primitives/src/ad_slot.rs
@@ -1,4 +1,4 @@
-use crate::{targeting::Rule, ValidatorId, IPFS, Address, UnifiedNum};
+use crate::{targeting::Rule, Address, UnifiedNum, ValidatorId, IPFS};
 use chrono::{
     serde::{ts_milliseconds, ts_milliseconds_option},
     DateTime, Utc,
diff --git a/primitives/src/sentry.rs b/primitives/src/sentry.rs
@@ -924,7 +924,8 @@ mod postgres {
     };
     use crate::{
         analytics::{AnalyticsQuery, Metric},
-        validator::{messages::Type as MessageType, MessageTypes}, IPFS,
+        validator::{messages::Type as MessageType, MessageTypes},
+        IPFS,
     };
     use bytes::BytesMut;
     use chrono::{DateTime, Timelike, Utc};
diff --git a/primitives/src/targeting/eval_test.rs b/primitives/src/targeting/eval_test.rs
@@ -2,6 +2,7 @@ use chrono::{TimeZone, Utc};
 
 use super::*;
 use crate::{
+    sentry::IMPRESSION,
     targeting::input,
     test_util::{DUMMY_CAMPAIGN, DUMMY_IPFS, LEADER},
     UnifiedMap,
@@ -17,11 +18,11 @@ fn get_default_input() -> Input {
             navigator_language: "bg".to_string(),
         }),
         global: input::Global {
-            ad_slot_id: "ad_slot_id Value".to_string(),
+            ad_slot_id: DUMMY_IPFS[0],
             ad_slot_type: "ad_slot_type Value".to_string(),
             publisher_id: *LEADER,
             country: Some("bg".to_string()),
-            event_type: "IMPRESSION".to_string(),
+            event_type: IMPRESSION,
             seconds_since_epoch: Utc.ymd(2020, 11, 6).and_hms(12, 0, 0),
             user_agent_os: Some("os".to_string()),
             user_agent_browser_family: Some("family".to_string()),
@@ -95,6 +96,8 @@ mod rules_test {
 }
 
 mod dsl_test {
+    use crate::sentry::CLICK;
+
     use super::*;
 
     #[test]
@@ -270,20 +273,28 @@ mod dsl_test {
 
     #[test]
     fn test_set_eval() {
-        use crate::campaign::{Pricing, PricingBounds};
+        use crate::campaign::Pricing;
         use crate::test_util::DUMMY_CAMPAIGN;
 
         let mut campaign = DUMMY_CAMPAIGN.clone();
-        campaign.pricing_bounds = Some(PricingBounds {
-            impression: Some(Pricing {
-                min: 1_000.into(),
-                max: 2_000.into(),
-            }),
-            click: Some(Pricing {
-                min: 3_000.into(),
-                max: 4_000.into(),
-            }),
-        });
+        campaign.pricing_bounds = vec![
+            (
+                IMPRESSION,
+                Pricing {
+                    min: 1_000.into(),
+                    max: 2_000.into(),
+                },
+            ),
+            (
+                CLICK,
+                Pricing {
+                    min: 3_000.into(),
+                    max: 4_000.into(),
+                },
+            ),
+        ]
+        .into_iter()
+        .collect();
 
         let input = get_default_input();
         let mut output = Output::from(&campaign);
diff --git a/primitives/src/targeting/input.rs b/primitives/src/targeting/input.rs
@@ -1,7 +1,7 @@
 use self::campaign::FullCampaign;
 
 use super::{Error, Value};
-use crate::{Address, IPFS, sentry::EventType};
+use crate::{sentry::EventType, Address, IPFS};
 use chrono::{serde::ts_seconds, DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
@@ -51,7 +51,7 @@ impl Input {
     pub fn with_campaign(mut self, campaign: crate::Campaign) -> Self {
         self.campaign = Some(Get::Getter(FullCampaign {
             campaign,
-            event_type: self.global.event_type.clone(),
+            event_type: self.global.event_type,
         }));
 
         self
@@ -210,7 +210,9 @@ pub mod campaign {
     use serde::Deserialize;
 
     use super::{field, Get, GetField, Value};
-    use crate::{targeting::get_pricing_bounds, Address, CampaignId, ToHex, UnifiedNum, sentry::EventType};
+    use crate::{
+        sentry::EventType, targeting::get_pricing_bounds, Address, CampaignId, ToHex, UnifiedNum,
+    };
 
     pub type GetCampaign = Get<FullCampaign, Values>;
 
@@ -370,7 +372,10 @@ pub mod balances {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{test_util::{LEADER, PUBLISHER}, sentry::IMPRESSION};
+    use crate::{
+        sentry::IMPRESSION,
+        test_util::{LEADER, PUBLISHER},
+    };
     pub use crate::{
         test_util::{DUMMY_CAMPAIGN as CAMPAIGN, DUMMY_IPFS as IPFS},
         AdUnit, UnifiedMap,
diff --git a/sentry/src/access.rs b/sentry/src/access.rs
@@ -172,7 +172,7 @@ mod test {
         config::GANACHE_CONFIG,
         event_submission::{RateLimit, Rule},
         sentry::Event,
-        test_util::{DUMMY_CAMPAIGN, FOLLOWER, IDS, PUBLISHER_2},
+        test_util::{DUMMY_CAMPAIGN, DUMMY_IPFS, FOLLOWER, IDS, PUBLISHER_2},
         Config, EventSubmission,
     };
 
@@ -206,8 +206,8 @@ mod test {
         (0..count)
             .map(|_| Event::Impression {
                 publisher: *PUBLISHER_2,
-                ad_unit: None,
-                ad_slot: None,
+                ad_unit: DUMMY_IPFS[0],
+                ad_slot: DUMMY_IPFS[1],
                 referrer: None,
             })
             .collect()
diff --git a/sentry/src/db/analytics.rs b/sentry/src/db/analytics.rs
@@ -69,7 +69,7 @@ fn analytics_query_params(
     allowed_keys: &HashSet<AllowedKey>,
 ) -> (Vec<String>, Vec<Box<(dyn ToSql + Sync + Send)>>) {
     let mut where_clauses = vec!["\"time\" >= $1".to_string()];
-    let mut params: Vec<Box<(dyn ToSql + Sync + Send)>> = vec![Box::new(query.time.start.clone())];
+    let mut params: Vec<Box<(dyn ToSql + Sync + Send)>> = vec![Box::new(query.time.start)];
 
     // for all allowed keys of this query
     // insert parameter into the SQL if there is a value set for it
@@ -93,10 +93,10 @@ fn analytics_query_params(
 
     if let Some(end_date) = &query.time.end {
         where_clauses.push(format!("\"time\" <= ${}", params.len() + 1));
-        params.push(Box::new(end_date.clone()));
+        params.push(Box::new(*end_date));
     }
     where_clauses.push(format!("event_type = ${}", params.len() + 1));
-    params.push(Box::new(query.event_type.clone()));
+    params.push(Box::new(query.event_type));
 
     where_clauses.push(format!("{} IS NOT NULL", query.metric.column_name()));
 
diff --git a/sentry/src/db/campaign.rs b/sentry/src/db/campaign.rs
@@ -236,10 +236,7 @@ pub async fn units_for_slot_get_campaigns(
     // Deposit assets
     match deposit_assets {
         Some(assets) if !assets.is_empty() => {
-            let assets_vec = assets
-                .into_iter()
-                .map(|address| *address)
-                .collect::<Vec<_>>();
+            let assets_vec = assets.iter().copied().collect::<Vec<_>>();
 
             where_clauses.push("channels.token IN ($3)".into());
             params.push(Box::new(assets_vec))
@@ -583,7 +580,7 @@ mod test {
         campaign,
         campaign::Validators,
         event_submission::{RateLimit, Rule},
-        sentry::campaign_modify::ModifyCampaign,
+        sentry::{campaign_modify::ModifyCampaign, CLICK, IMPRESSION},
         targeting::Rules,
         test_util::{
             ADVERTISER, ADVERTISER_2, CREATOR, DUMMY_AD_UNITS, DUMMY_CAMPAIGN,
@@ -650,16 +647,26 @@ mod test {
                 budget: Some(new_budget),
                 validators: None,
                 title: Some("Modified Campaign".to_string()),
-                pricing_bounds: Some(campaign::PricingBounds {
-                    impression: Some(campaign::Pricing {
-                        min: 1.into(),
-                        max: 10.into(),
-                    }),
-                    click: Some(campaign::Pricing {
-                        min: 0.into(),
-                        max: 0.into(),
-                    }),
-                }),
+                pricing_bounds: Some(
+                    vec![
+                        (
+                            IMPRESSION,
+                            campaign::Pricing {
+                                min: 1.into(),
+                                max: 10.into(),
+                            },
+                        ),
+                        (
+                            CLICK,
+                            campaign::Pricing {
+                                min: 0.into(),
+                                max: 0.into(),
+                            },
+                        ),
+                    ]
+                    .into_iter()
+                    .collect(),
+                ),
                 event_submission: Some(EventSubmission { allow: vec![rule] }),
                 ad_units: Some(DUMMY_AD_UNITS.to_vec()),
                 targeting_rules: Some(Rules::new()),
diff --git a/sentry/src/payout.rs b/sentry/src/payout.rs
@@ -50,7 +50,7 @@ pub fn get_payout(
                         ad_slot_type: ad_unit.map(|u| u.ad_type.clone()).unwrap_or_default(),
                         publisher_id: *publisher,
                         country: session.country.clone(),
-                        event_type: event_type.clone(),
+                        event_type: event_type,
                         seconds_since_epoch: Utc::now(),
                         user_agent_os: session.os.clone(),
                         user_agent_browser_family: None,
@@ -93,10 +93,9 @@ pub fn get_payout(
 mod test {
     use super::*;
     use primitives::{
-        campaign::{Pricing, PricingBounds},
+        campaign::Pricing,
         sentry::{CLICK, IMPRESSION},
         test_util::{discard_logger, DUMMY_CAMPAIGN, DUMMY_IPFS, LEADER, PUBLISHER},
-        IPFS,
     };
 
     #[test]
diff --git a/sentry/src/routes/routers.rs b/sentry/src/routes/routers.rs
diff --git a/sentry/src/routes/units_for_slot.rs b/sentry/src/routes/units_for_slot.rs
diff --git a/test_harness/src/lib.rs b/test_harness/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use crate::{targeting::Rule, ValidatorId, IPFS, Address, UnifiedNum};`
	`1`	`+use crate::{targeting::Rule, Address, UnifiedNum, ValidatorId, IPFS};`
`2`	`2`	`use chrono::{`
`3`	`3`	`serde::{ts_milliseconds, ts_milliseconds_option},`
`4`	`4`	`DateTime, Utc,`