resolve cloning and log msgs

Cardinal-Cryptography · Oct 6, 2023 · 38be508 · 38be508
1 parent d55db7e
commit 38be508
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/rmc/src/handler.rs b/rmc/src/handler.rs
@@ -41,7 +41,9 @@ impl<H: Signable + Hash + Eq + Clone + Debug, MK: MultiKeychain> Handler<H, MK>
     /// version of the hash for broadcast. Should be called at most once for a particular hash.
     pub fn on_start_rmc(&mut self, hash: H) -> Signed<Indexed<H>, MK> {
         let signed_hash = Signed::sign_with_index(hash, &self.keychain);
-        self.handle_signed_hash(signed_hash.clone());
+        if !self.already_completed(signed_hash.as_signable().as_signable()) {
+            self.handle_signed_hash(signed_hash.clone());
+        }
         signed_hash
     }
     /// Update the internal state with the signed hash. If the hash is incorrectly signed then
@@ -54,30 +56,32 @@ impl<H: Signable + Hash + Eq + Clone + Debug, MK: MultiKeychain> Handler<H, MK>
         let signed_hash = unchecked
             .check(&self.keychain)
             .map_err(|_| Error::BadSignature)?;
-        Ok(self.handle_signed_hash(signed_hash))
+        Ok(
+            match self.already_completed(signed_hash.as_signable().as_signable()) {
+                true => None,
+                false => self.handle_signed_hash(signed_hash),
+            },
+        )
     }
 
     fn handle_signed_hash(&mut self, signed: Signed<Indexed<H>, MK>) -> Option<Multisigned<H, MK>> {
         let hash = signed.as_signable().as_signable().clone();
-        if self.already_completed(&hash) {
-            return None;
-        }
         let new_state = match self.hash_states.remove(&hash) {
             None => signed.into_partially_multisigned(&self.keychain),
             Some(partial) => partial.add_signature(signed, &self.keychain),
         };
         match new_state {
             PartiallyMultisigned::Complete { multisigned } => {
                 self.hash_states.insert(
-                    hash.clone(),
+                    hash,
                     PartiallyMultisigned::Complete {
                         multisigned: multisigned.clone(),
                     },
                 );
                 Some(multisigned)
             }
             incomplete => {
-                self.hash_states.insert(hash.clone(), incomplete);
+                self.hash_states.insert(hash, incomplete);
                 None
             }
         }

diff --git a/rmc/src/service.rs b/rmc/src/service.rs
@@ -88,7 +88,7 @@ where
                     }
                     Ok(None) => {}
                     Err(error) => {
-                        warn!(target: LOG_TARGET, "{}", error);
+                        warn!(target: LOG_TARGET, "failed handling signed hash: {}", error);
                     }
                 }
             }
@@ -102,7 +102,7 @@ where
                     }
                     Ok(None) => {}
                     Err(error) => {
-                        warn!(target: LOG_TARGET, "{}", error);
+                        warn!(target: LOG_TARGET, "failed handling multisigned hash: {}", error);
                     }
                 }
             }