Change opcert parameter type in KeyRegWrapper register function

Author: Damien LACHAUME / PALO-IT

mithril-aggregator/src/signer_registerer.rs

@@ -222,11 +222,7 @@ impl SignerRegisterer for MithrilSignerRegisterer {
             "" => None,
             party_id => Some(party_id.to_string()),
         };
-        let operational_certificate = signer
-            .operational_certificate
-            .as_ref()
-            .map(|op_cert| op_cert.to_owned().into());
-        let kes_period = match &operational_certificate {
+        let kes_period = match &signer.operational_certificate {
             Some(operational_certificate) => Some(
                 self.chain_observer
                     .get_current_kes_period(operational_certificate)
@@ -239,7 +235,7 @@ impl SignerRegisterer for MithrilSignerRegisterer {
         };
         let party_id_save = key_registration.register(
             party_id_register.clone(),
-            operational_certificate,
+            signer.operational_certificate.clone(),
             signer.verification_key_signature.clone(),
             kes_period,
             signer.verification_key.clone(),

mithril-common/src/crypto_helper/cardano/key_certification.rs

@@ -4,11 +4,12 @@
 //! guarantees that mithril-stm will not be misused in the context of Cardano.  
 
 use crate::crypto_helper::{
-    cardano::{OpCert, ParseError, SerDeShelleyFileFormat},
+    cardano::{ParseError, SerDeShelleyFileFormat},
     types::{
         ProtocolParameters, ProtocolPartyId, ProtocolSignerVerificationKey,
         ProtocolSignerVerificationKeySignature, ProtocolStakeDistribution,
     },
+    ProtocolOpCert,
 };
 
 use mithril_stm::key_reg::{ClosedKeyReg, KeyReg};
@@ -240,7 +241,7 @@ impl KeyRegWrapper {
     pub fn register(
         &mut self,
         party_id: Option<ProtocolPartyId>, // TODO: Parameter should be removed once the signer certification is fully deployed
-        opcert: Option<OpCert>, // TODO: Option should be removed once the signer certification is fully deployed
+        opcert: Option<ProtocolOpCert>, // TODO: Option should be removed once the signer certification is fully deployed
         kes_sig: Option<ProtocolSignerVerificationKeySignature>, // TODO: Option should be removed once the signer certification is fully deployed
         kes_period: Option<KESPeriod>,
         pk: ProtocolSignerVerificationKey,
@@ -299,7 +300,7 @@ impl KeyRegWrapper {
 mod test {
 
     use super::*;
-    use crate::crypto_helper::cardano::ColdKeyGenerator;
+    use crate::crypto_helper::{cardano::ColdKeyGenerator, OpCert};
 
     use rand_chacha::ChaCha20Rng;
     use rand_core::SeedableRng;
@@ -360,8 +361,9 @@ mod test {
         )
         .unwrap();
 
-        let opcert1: OpCert = OpCert::from_file(operational_certificate_file_1)
-            .expect("opcert deserialization should not fail");
+        let opcert1 = OpCert::from_file(operational_certificate_file_1)
+            .expect("opcert deserialization should not fail")
+            .into();
 
         let key_registration_1 = key_reg.register(
             None,
@@ -381,8 +383,9 @@ mod test {
         )
         .unwrap();
 
-        let opcert2: OpCert = OpCert::from_file(operational_certificate_file_2)
-            .expect("opcert deserialization should not fail");
+        let opcert2 = OpCert::from_file(operational_certificate_file_2)
+            .expect("opcert deserialization should not fail")
+            .into();
 
         let key_registration_2 = key_reg.register(
             None,

mithril-common/src/crypto_helper/tests_setup.rs

@@ -92,10 +92,11 @@ fn setup_signer_with_stake(
     )
 }
 
-fn decode_op_cert_in_dir(dir: Option<PathBuf>) -> Option<OpCert> {
+fn decode_op_cert_in_dir(dir: Option<PathBuf>) -> Option<ProtocolOpCert> {
     dir.as_ref().map(|dir| {
         OpCert::from_file(dir.join("opcert.cert"))
             .expect("operational certificate decoding should not fail")
+            .into()
     })
 }
 
@@ -122,7 +123,7 @@ pub fn setup_signers_from_stake_distribution(
             party_id,
             *stake,
             &protocol_initializer,
-            operational_certificate.as_ref().map(|o| o.clone().into()),
+            operational_certificate.clone(),
             kes_period,
         );
 

mithril-common/src/protocol/signer_builder.rs

@@ -51,7 +51,7 @@ impl SignerBuilder {
             key_registration
                 .register(
                     Some(signer.party_id.to_owned()),
-                    signer.operational_certificate.as_deref().cloned(),
+                    signer.operational_certificate.clone(),
                     signer.verification_key_signature.clone(),
                     signer.kes_period,
                     signer.verification_key.clone(),