Merge branch 'dev' into supermarket-changes

Author: elpiel

sentry/src/access.rs

@@ -246,7 +246,7 @@ mod test {
     fn get_impression_events(count: i8) -> Vec<Event> {
         (0..count)
             .map(|_| Event::Impression {
-                publisher: IDS["publisher2"].clone(),
+                publisher: IDS["publisher2"],
                 ad_unit: None,
                 ad_slot: None,
                 referrer: None,
@@ -260,7 +260,7 @@ mod test {
 
         let auth = Auth {
             era: 0,
-            uid: IDS["follower"].clone(),
+            uid: IDS["follower"],
         };
 
         let session = Session {
@@ -314,7 +314,7 @@ mod test {
 
         let auth = Auth {
             era: 0,
-            uid: IDS["follower"].clone(),
+            uid: IDS["follower"],
         };
 
         let session = Session {

sentry/src/event_reducer.rs

@@ -84,7 +84,7 @@ mod test {
         };
 
         let event = Event::Impression {
-            publisher: IDS["publisher"].clone(),
+            publisher: IDS["publisher"],
             ad_unit: None,
             ad_slot: None,
             referrer: None,

sentry/src/middleware/auth.rs

@@ -107,7 +107,7 @@ mod test {
 
     async fn setup() -> (DummyAdapter, MultiplexedConnection) {
         let adapter_options = DummyAdapterOptions {
-            dummy_identity: IDS["leader"].clone(),
+            dummy_identity: IDS["leader"],
             dummy_auth: IDS.clone(),
             dummy_auth_tokens: AUTH.clone(),
         };

sentry/src/payout.rs

@@ -132,7 +132,7 @@ mod tests {
         let cases: Vec<(Event, BigNum, String)> = vec![
             (
                 Event::Impression {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -142,7 +142,7 @@ mod tests {
             ),
             (
                 Event::Click {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -193,7 +193,7 @@ mod tests {
         let cases: Vec<(Event, BigNum, String)> = vec![
             (
                 Event::Impression {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -203,7 +203,7 @@ mod tests {
             ),
             (
                 Event::Click {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -250,7 +250,7 @@ mod tests {
         let cases: Vec<(Event, BigNum, String)> = vec![
             (
                 Event::Impression {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -260,7 +260,7 @@ mod tests {
             ),
             (
                 Event::Click {
-                    publisher: IDS["publisher"].clone(),
+                    publisher: IDS["publisher"],
                     ad_slot: None,
                     ad_unit: None,
                     referrer: None,
@@ -308,7 +308,7 @@ mod tests {
                 amount: Some(BigNum::from(12)),
                 os_type: None,
                 ev_type: Some(vec!["CLICK".to_string()]),
-                publisher: Some(vec![IDS["publisher"].clone()]),
+                publisher: Some(vec![IDS["publisher"]]),
                 country: Some(vec!["us".to_string()]),
             },
         ];
@@ -321,7 +321,7 @@ mod tests {
         };
 
         let event = Event::Click {
-            publisher: IDS["publisher"].clone(),
+            publisher: IDS["publisher"],
             ad_slot: None,
             ad_unit: None,
             referrer: None,
@@ -350,15 +350,15 @@ mod tests {
                 amount: None,
                 os_type: Some(vec!["android".to_string()]),
                 ev_type: Some(vec!["CLICK".to_string()]),
-                publisher: Some(vec![IDS["publisher"].clone()]),
+                publisher: Some(vec![IDS["publisher"]]),
                 country: Some(vec!["us".to_string()]),
             },
             PriceMultiplicationRules {
                 multiplier: None,
                 amount: Some(BigNum::from(12)),
                 os_type: None,
                 ev_type: Some(vec!["CLICK".to_string()]),
-                publisher: Some(vec![IDS["publisher"].clone()]),
+                publisher: Some(vec![IDS["publisher"]]),
                 country: Some(vec!["us".to_string()]),
             },
         ];
@@ -371,7 +371,7 @@ mod tests {
         };
 
         let event = Event::Click {
-            publisher: IDS["publisher"].clone(),
+            publisher: IDS["publisher"],
             ad_slot: None,
             ad_unit: None,
             referrer: None,
@@ -401,7 +401,7 @@ mod tests {
                 amount: None,
                 os_type: Some(vec!["android".to_string()]),
                 ev_type: Some(vec!["CLICK".to_string()]),
-                publisher: Some(vec![IDS["publisher"].clone()]),
+                publisher: Some(vec![IDS["publisher"]]),
                 country: Some(vec!["us".to_string()]),
             },
             PriceMultiplicationRules {