Reduce some clones in predicate impls (#151)

* reduce some clones in predicate types

* remove unnecesary clone restrictions

* better naming

* remove more unnecesary from impls

* make diff look smaller

Author: divagant-martian

src/kbucket.rs

@@ -104,42 +104,42 @@ impl<TNodeId, TVal> AsRef<Key<TNodeId>> for ClosestValue<TNodeId, TVal> {
 
 /// A key that can be returned from the `closest_keys` function, which indicates if the key matches the
 /// predicate or not.
-pub struct PredicateKey<TNodeId: Clone> {
+pub struct PredicateKey<TNodeId> {
     pub key: Key<TNodeId>,
     pub predicate_match: bool,
 }
 
-impl<TNodeId: Clone> From<PredicateKey<TNodeId>> for Key<TNodeId> {
+impl<TNodeId> From<PredicateKey<TNodeId>> for Key<TNodeId> {
     fn from(key: PredicateKey<TNodeId>) -> Self {
         key.key
     }
 }
 
-impl<TNodeId: Clone, TVal> From<PredicateValue<TNodeId, TVal>> for PredicateKey<TNodeId> {
-    fn from(value: PredicateValue<TNodeId, TVal>) -> Self {
-        PredicateKey {
-            key: value.key,
-            predicate_match: value.predicate_match,
-        }
-    }
-}
-
 /// A value being returned from a predicate closest iterator.
-pub struct PredicateValue<TNodeId: Clone, TVal> {
+pub struct PredicateValue<TNodeId, TVal> {
     pub key: Key<TNodeId>,
     pub predicate_match: bool,
     pub value: TVal,
 }
 
-impl<TNodeId: Clone, TVal> AsRef<Key<TNodeId>> for PredicateValue<TNodeId, TVal> {
+impl<TNodeId, TVal> AsRef<Key<TNodeId>> for PredicateValue<TNodeId, TVal> {
     fn as_ref(&self) -> &Key<TNodeId> {
         &self.key
     }
 }
 
-impl<TNodeId: Clone, TVal> From<PredicateValue<TNodeId, TVal>> for Key<TNodeId> {
-    fn from(key: PredicateValue<TNodeId, TVal>) -> Self {
-        key.key
+impl<TNodeId, TVal> PredicateValue<TNodeId, TVal> {
+    pub fn to_key_value(self) -> (PredicateKey<TNodeId>, TVal) {
+        let PredicateValue {
+            key,
+            predicate_match,
+            value,
+        } = self;
+        let key = PredicateKey {
+            key,
+            predicate_match,
+        };
+        (key, value)
     }
 }
 

src/service.rs

@@ -492,10 +492,11 @@ impl Service {
         {
             let mut kbuckets = self.kbuckets.write();
             for closest in kbuckets.closest_values_predicate(&target_key, &kbucket_predicate) {
+                let (node_id_predicate, enr) = closest.to_key_value();
                 // Add the known ENR's to the untrusted list
-                target.untrusted_enrs.push(closest.value.clone());
+                target.untrusted_enrs.push(enr);
                 // Add the key to the list for the query
-                known_closest_peers.push(closest.into());
+                known_closest_peers.push(node_id_predicate);
             }
         };