Merge pull request #294 from AdExNetwork/copy-on-validator-id

Derive Copy for ValidatorId

Author: samparsky

adapter/src/dummy.rs

@@ -103,7 +103,7 @@ impl Adapter for DummyAdapter {
 
             match identity {
                 Some((id, _)) => Ok(Session {
-                    uid: self.session_tokens[id].clone(),
+                    uid: self.session_tokens[id],
                     era: 0,
                 }),
                 None => Err(AdapterError::Authentication(format!(

primitives/src/validator.rs

@@ -14,7 +14,7 @@ pub enum ValidatorError {
     InvalidTransition,
 }
 
-#[derive(Deserialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Deserialize, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[serde(transparent)]
 pub struct ValidatorId(
     #[serde(

sentry/src/db/event_aggregate.rs

@@ -177,7 +177,7 @@ pub async fn insert_event_aggregate(
                 data.push(EventData {
                     id: channel_id.to_owned(),
                     event_type: event_type.clone(),
-                    earner: Some(earner.clone()),
+                    earner: Some(*earner),
                     event_count: event_count.to_owned(),
                     event_payout: event_payout.clone(),
                 });

sentry/src/event_reducer.rs

@@ -27,10 +27,9 @@ pub(crate) fn reduce(
             initial_aggr.events.insert("CLICK".to_owned(), merge);
         }
         Event::Close => {
-            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())]
+                event_counts: Some(vec![(channel.creator, 1.into())].into_iter().collect()),
+                event_payouts: vec![(channel.creator, channel.deposit_amount.clone())]
                     .into_iter()
                     .collect(),
             };

sentry/src/routes/event_aggregate.rs

@@ -32,7 +32,7 @@ pub async fn list_channel_event_aggregates<A: Adapter>(
     let from = if channel.spec.validators.find(&auth.uid).is_some() {
         None
     } else {
-        Some(auth.uid.clone())
+        Some(auth.uid)
     };
 
     let event_aggregates = list_event_aggregates(

validator_worker/src/main.rs

@@ -197,7 +197,7 @@ async fn validator_tick<A: Adapter + 'static>(
     config: &Config,
     logger: &Logger,
 ) -> Result<(ChannelId, Box<dyn Debug>), ValidatorWorkerError<A::AdapterError>> {
-    let whoami = adapter.whoami().clone();
+    let whoami = *adapter.whoami();
 
     // Cloning the `Logger` is cheap, see documentation for more info
     let sentry = SentryApi::init(adapter, channel.clone(), &config, logger.clone())

validator_worker/src/sentry_interface.rs

@@ -116,13 +116,8 @@ impl<A: Adapter + 'static> SentryApi<A> {
             }
             None => Err(Error::MissingWhoamiInChannelValidators {
                 channel: channel.id,
-                validators: channel
-                    .spec
-                    .validators
-                    .iter()
-                    .map(|v| v.id.clone())
-                    .collect(),
-                whoami: adapter.whoami().clone(),
+                validators: channel.spec.validators.iter().map(|v| v.id).collect(),
+                whoami: *adapter.whoami(),
             }),
         }
     }
@@ -242,12 +237,12 @@ async fn propagate_to<A: Adapter>(
         .json(&body)
         .send()
         .await
-        .map_err(|e| (validator.id.clone(), Error::Request(e)))?
+        .map_err(|e| (validator.id, Error::Request(e)))?
         .json()
         .await
-        .map_err(|e| (validator.id.clone(), Error::Request(e)))?;
+        .map_err(|e| (validator.id, Error::Request(e)))?;
 
-    Ok(validator.id.clone())
+    Ok(validator.id)
 }
 
 pub async fn all_channels(