fix clippy & primitives - IPFS is now Copy

Author: elpiel

adview-manager/src/lib.rs

@@ -217,8 +217,8 @@ pub fn get_unit_html_with_events(
         events: vec![Event {
             event_type: event_type.to_string(),
             publisher: options.publisher_addr,
-            ad_unit: ad_unit.id.clone(),
-            ad_slot: options.market_slot.clone(),
+            ad_unit: ad_unit.id,
+            ad_slot: options.market_slot,
             referrer: "document.referrer".to_string(),
         }],
     };
@@ -477,12 +477,12 @@ impl Manager {
                     .units_with_price
                     .iter()
                     .filter(|unit_with_price| {
-                        unit_input.ad_unit_id = Some(unit_with_price.unit.id.clone());
+                        unit_input.ad_unit_id = Some(unit_with_price.unit.id);
 
                         let mut output = targeting::Output {
                             show: true,
                             boost: 1.0,
-                            price: vec![("IMPRESSION".to_string(), unit_with_price.price.clone())]
+                            price: vec![("IMPRESSION".to_string(), unit_with_price.price)]
                                 .into_iter()
                                 .collect(),
                         };
@@ -519,9 +519,9 @@ impl Manager {
 
             let new_entry = HistoryEntry {
                 time: Utc::now(),
-                unit_id: unit_with_price.unit.id.clone(),
+                unit_id: unit_with_price.unit.id,
                 campaign_id: *campaign_id,
-                slot_id: self.options.market_slot.clone(),
+                slot_id: self.options.market_slot,
             };
 
             *self.history.write().await = history
@@ -562,7 +562,7 @@ impl Manager {
 
             Ok(Some(NextAdUnit {
                 unit: unit_with_price.unit.clone(),
-                price: unit_with_price.price.clone(),
+                price: unit_with_price.price,
                 accepted_referrers: units_for_slot.accepted_referrers,
                 html,
             }))

primitives/src/channel_v5.rs

@@ -42,7 +42,7 @@ pub struct Nonce(pub U256);
 
 impl Nonce {
     /// In Big-Endian
-    pub fn to_bytes(&self) -> [u8; 32] {
+    pub fn to_bytes(self) -> [u8; 32] {
         // the impl of From<U256> uses BigEndian
         self.0.into()
     }

primitives/src/ipfs.rs

@@ -7,7 +7,7 @@ const URL_PREFIX: &str = "ipfs://";
 
 pub use cid::{Cid, Error};
 
-#[derive(Hash, Clone, Serialize, Deserialize, Eq, PartialEq)]
+#[derive(Hash, Copy, Clone, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(try_from = "String", into = "String")]
 #[allow(clippy::upper_case_acronyms)]
 pub struct IPFS(pub cid::Cid);

primitives/src/supermarket.rs

@@ -43,10 +43,7 @@ pub enum Finalized {
 pub mod units_for_slot {
     pub mod response {
 
-        use crate::{
-            targeting::Input,
-            UnifiedNum, IPFS,
-        };
+        use crate::{targeting::Input, UnifiedNum, IPFS};
         use serde::{Deserialize, Serialize};
         use url::Url;
 
@@ -88,7 +85,7 @@ pub mod units_for_slot {
         impl From<&crate::AdUnit> for AdUnit {
             fn from(ad_unit: &crate::AdUnit) -> Self {
                 Self {
-                    id: ad_unit.ipfs.clone(),
+                    id: ad_unit.ipfs,
                     media_url: ad_unit.media_url.clone(),
                     media_mime: ad_unit.media_mime.clone(),
                     target_url: ad_unit.target_url.clone(),

primitives/src/targeting.rs

@@ -50,7 +50,7 @@ impl Output {
                     .price
                     .get(price_key.trim_start_matches("price."))
                     .ok_or(Error::UnknownVariable)?;
-                Ok(Value::UnifiedNum(price.clone()))
+                Ok(Value::UnifiedNum(*price))
             }
             _ => Err(Error::UnknownVariable),
         }

primitives/src/targeting/input.rs

@@ -282,10 +282,10 @@ pub mod campaign {
                     }) => (*campaign_seconds_duration).into(),
                 })),
                 field::Campaign::CampaignBudget => Some(Value::UnifiedNum(match self {
-                    Get::Getter(FullCampaign { campaign, .. }) => campaign.budget.clone(),
+                    Get::Getter(FullCampaign { campaign, .. }) => campaign.budget,
                     Get::Value(Values {
                         campaign_budget, ..
-                    }) => campaign_budget.clone(),
+                    }) => *campaign_budget,
                 })),
                 field::Campaign::EventMinPrice => match self {
                     Get::Getter(FullCampaign {
@@ -296,7 +296,7 @@ pub mod campaign {
                     )),
                     Get::Value(Values {
                         event_min_price, ..
-                    }) => event_min_price.clone().map(Value::UnifiedNum),
+                    }) => event_min_price.map(Value::UnifiedNum),
                 },
                 field::Campaign::EventMaxPrice => match self {
                     Get::Getter(FullCampaign {
@@ -307,7 +307,7 @@ pub mod campaign {
                     )),
                     Get::Value(Values {
                         event_max_price, ..
-                    }) => event_max_price.clone().map(Value::UnifiedNum),
+                    }) => event_max_price.map(Value::UnifiedNum),
                 },
             }
         }

primitives/src/unified_num.rs

@@ -28,20 +28,18 @@ use std::{
 /// use primitives::UnifiedNum;
 /// use serde_json::Value;
 ///
-/// fn main() {
-///     let unified_num = UnifiedNum::from(42_999_987_654_321);
-///     
-///     // Printing the unified num will show the value and the decimal point with precision of `UnifiedNum::PRECISION` (i.e. `8`) numbers after the decimal point
-///     assert_eq!("42999987654321", &unified_num.to_string());
+/// let unified_num = UnifiedNum::from(42_999_987_654_321);
 ///
-///     assert_eq!("429999.87654321", &unified_num.to_float_string());
+/// // Printing the unified num will show the value and the decimal point with precision of `UnifiedNum::PRECISION` (i.e. `8`) numbers after the decimal point
+/// assert_eq!("42999987654321", &unified_num.to_string());
 ///
-///     // Printing the Debug of unified num will show the value and the decimal point with precision of `UnifiedNum::PRECISION` (i.e. `8`) numbers after the decimal point
-///     assert_eq!("UnifiedNum(429999.87654321)".to_string(), format!("{:?}", &unified_num));
+/// assert_eq!("429999.87654321", &unified_num.to_float_string());
 ///
-///     // JSON Serializing and Deserializing the `UnifiedNum` yields a string without any decimal points
-///     assert_eq!(Value::String("42999987654321".to_string()), serde_json::to_value(unified_num).unwrap());
-/// }
+/// // Printing the Debug of unified num will show the value and the decimal point with precision of `UnifiedNum::PRECISION` (i.e. `8`) numbers after the decimal point
+/// assert_eq!("UnifiedNum(429999.87654321)".to_string(), format!("{:?}", &unified_num));
+///
+/// // JSON Serializing and Deserializing the `UnifiedNum` yields a string without any decimal points
+/// assert_eq!(Value::String("42999987654321".to_string()), serde_json::to_value(unified_num).unwrap());
 /// ```
 #[derive(
     Clone,
@@ -79,7 +77,6 @@ impl TryFrom<String> for UnifiedNum {
     }
 }
 
-
 impl UnifiedNum {
     pub const PRECISION: u8 = 8;
     pub const DEBUG_DELIMITER: char = '.';
@@ -92,11 +89,11 @@ impl UnifiedNum {
         Self(value)
     }
 
-    pub const fn to_u64(&self) -> u64 {
+    pub const fn to_u64(self) -> u64 {
         self.0
     }
 
-    pub fn to_bignum(&self) -> BigNum {
+    pub fn to_bignum(self) -> BigNum {
         BigNum::from(self.0)
     }
 
@@ -121,7 +118,7 @@ impl UnifiedNum {
     }
 
     /// Transform the UnifiedNum precision 8 to a new precision
-    pub fn to_precision(&self, precision: u8) -> BigNum {
+    pub fn to_precision(self, precision: u8) -> BigNum {
         let inner = BigNum::from(self.0);
         match precision.cmp(&Self::PRECISION) {
             Ordering::Equal => inner,
@@ -130,7 +127,7 @@ impl UnifiedNum {
         }
     }
 
-    pub fn to_float_string(&self) -> String {
+    pub fn to_float_string(self) -> String {
         let mut string_value = self.0.to_string();
         let value_length = string_value.len();
         let precision: usize = Self::PRECISION.into();

primitives/src/validator.rs

@@ -22,27 +22,13 @@ impl ValidatorId {
         self.0.as_bytes()
     }
 
-    pub fn to_address(&self) -> Address {
+    pub fn to_address(self) -> Address {
         self.0
     }
 
     pub fn inner(&self) -> &[u8; 20] {
         &self.0.as_bytes()
     }
-
-    /// To Hex non-`0x` prefixed string without **Checksum**ing the string
-    /// For backwards compatibility
-    /// TODO: Remove once we change all places this method is used at
-    pub fn to_hex_non_prefix_string(&self) -> String {
-        self.0.to_hex()
-    }
-
-    /// To Hex `0x` prefixed string **without** __Checksum__ing the string
-    /// For backwards compatibility
-    /// TODO: Remove once we change all places this method is used at
-    pub fn to_hex_prefix_string(&self) -> String {
-        self.0.to_hex_prefixed()
-    }
 }
 
 impl ToETHChecksum for ValidatorId {}

sentry/src/payout.rs

@@ -1,6 +1,11 @@
 use crate::Session;
 use chrono::Utc;
-use primitives::{Address, BigNum, Campaign, UnifiedNum, sentry::Event, targeting::Input, targeting::{eval_with_callback, get_pricing_bounds, input, Error, Output}};
+use primitives::{
+    sentry::Event,
+    targeting::Input,
+    targeting::{eval_with_callback, get_pricing_bounds, input, Error, Output},
+    Address, Campaign, UnifiedNum,
+};
 use slog::{error, Logger};
 use std::cmp::{max, min};