Few enhancements in multi signer

Author: jpraynaud

mithril-aggregator/src/http_server.rs

@@ -203,7 +203,7 @@ mod handlers {
             Ok(Some(beacon)) => {
                 let message = fake_data::digest(&beacon);
                 let multi_signer = multi_signer.read().await;
-                match multi_signer.get_multi_signature(message.encode_hex::<String>()) {
+                match multi_signer.get_multi_signature(&message.encode_hex::<String>()) {
                     Ok(None) => {
                         let mut certificate_pending = fake_data::certificate_pending();
                         certificate_pending.beacon = beacon.clone();
@@ -285,7 +285,7 @@ mod handlers {
         // TODO: This is temporary implementation that will be replaced with real certificate production
         let multi_signer = multi_signer.read().await;
         let message = certificate_hash.clone();
-        match multi_signer.get_multi_signature(message.clone()) {
+        match multi_signer.get_multi_signature(&message) {
             Ok(Some(multi_signature)) => {
                 let beacon_store = beacon_store.read().await;
                 let beacon = beacon_store.get_current_beacon().await.unwrap().unwrap();

mithril-aggregator/src/multi_signer.rs

@@ -87,7 +87,7 @@ pub trait MultiSigner: Sync + Send {
     /// Retrieves a multi signature from a message
     fn get_multi_signature(
         &self,
-        message: String,
+        message: &str,
     ) -> Result<Option<ProtocolMultiSignature>, ProtocolError>;
 
     /// Create a multi signature from single signatures
@@ -96,12 +96,23 @@ pub trait MultiSigner: Sync + Send {
 
 /// MultiSignerImpl is an implementation of the MultiSigner
 pub struct MultiSignerImpl {
+    /// Message that is currently signed
     current_message: Option<Bytes>,
+
+    /// Protocol parameters used for signing
     protocol_parameters: Option<ProtocolParameters>,
+
+    /// Stake distribution used for signing
     stakes: ProtocolStakeDistribution,
+
+    /// Registered signers
     signers: HashMap<ProtocolPartyId, ProtocolSignerVerificationKey>,
+
+    /// Registered single signatures by party and lottery index
     single_signatures:
         HashMap<ProtocolPartyId, HashMap<ProtocolLotteryIndex, ProtocolSingleSignature>>,
+
+    /// Recorded multi signatures by message signed
     multi_signatures: HashMap<String, String>,
 }
 
@@ -271,10 +282,10 @@ impl MultiSigner for MultiSignerImpl {
     /// Retrieves a multi signature from a message
     fn get_multi_signature(
         &self,
-        message: String,
+        message: &str,
     ) -> Result<Option<ProtocolMultiSignature>, ProtocolError> {
         debug!("Get multi signature for message {}", message);
-        match self.multi_signatures.get(&message) {
+        match self.multi_signatures.get(message) {
             Some(multi_signature) => {
                 let multi_signature: ProtocolMultiSignature =
                     key_decode_hex(multi_signature).map_err(ProtocolError::Codec)?;
@@ -463,7 +474,7 @@ mod tests {
             .create_multi_signature()
             .expect("create multi sgnature should not fail");
         assert!(multi_signer
-            .get_multi_signature(message.encode_hex::<String>())
+            .get_multi_signature(&message.encode_hex::<String>())
             .expect("get multi signature should not fail")
             .is_none());
         signatures[0..quorum_split]
@@ -477,7 +488,7 @@ mod tests {
             .create_multi_signature()
             .expect("create multi sgnature should not fail");
         assert!(multi_signer
-            .get_multi_signature(message.encode_hex::<String>())
+            .get_multi_signature(&message.encode_hex::<String>())
             .expect("get multi signature should not fail")
             .is_none());
         signatures[quorum_split..]
@@ -491,7 +502,7 @@ mod tests {
             .create_multi_signature()
             .expect("create multi sgnature should not fail");
         assert!(multi_signer
-            .get_multi_signature(message.encode_hex::<String>())
+            .get_multi_signature(&message.encode_hex::<String>())
             .expect("get multi signature should not fail")
             .is_some());
     }

mithril-aggregator/src/runtime.rs

@@ -164,7 +164,7 @@ impl AggregatorRuntime {
     ) -> Result<bool, RuntimeError> {
         let mut multi_signer = self.multi_signer.write().await;
         let mut beacon_store = self.beacon_store.write().await;
-        match multi_signer.get_multi_signature(message.encode_hex::<String>()) {
+        match multi_signer.get_multi_signature(&message.encode_hex::<String>()) {
             Ok(None) => {
                 beacon_store.set_current_beacon(beacon.clone()).await?;
                 multi_signer.update_current_message(message.to_owned())?;