From 6bf0d673b0b9bf40444ad411003a84d1850af33d Mon Sep 17 00:00:00 2001 From: sfauvel Date: Fri, 6 Sep 2024 11:22:10 +0200 Subject: [PATCH] Remove signers assignation in `FromPendingCertificateMessageAdapter` --- .../from_pending_certificate_message.rs | 77 ++----------------- 1 file changed, 8 insertions(+), 69 deletions(-) diff --git a/mithril-signer/src/message_adapters/from_pending_certificate_message.rs b/mithril-signer/src/message_adapters/from_pending_certificate_message.rs index 31565f977b8..6c4f5a4def7 100644 --- a/mithril-signer/src/message_adapters/from_pending_certificate_message.rs +++ b/mithril-signer/src/message_adapters/from_pending_certificate_message.rs @@ -1,79 +1,28 @@ -use anyhow::Context; +#![allow(deprecated)] + use mithril_common::{ - crypto_helper::{ - ProtocolOpCert, ProtocolSignerVerificationKey, ProtocolSignerVerificationKeySignature, - }, - entities::{CertificatePending, Signer}, - messages::{CertificatePendingMessage, SignerMessagePart, TryFromMessageAdapter}, + entities::CertificatePending, + messages::{CertificatePendingMessage, TryFromMessageAdapter}, StdResult, }; /// Adapter to turn [CertificatePendingMessage] instances into [CertificatePending]. pub struct FromPendingCertificateMessageAdapter; -fn to_signers(messages: &[SignerMessagePart]) -> StdResult> { - let mut signers: Vec = Vec::new(); - - for msg in messages { - let signer = Signer::new( - msg.party_id.to_owned(), - ProtocolSignerVerificationKey::from_json_hex(&msg.verification_key)?, - match &msg.verification_key_signature { - Some(verification_key_signature) => Some( - ProtocolSignerVerificationKeySignature::from_json_hex( - verification_key_signature, - ) - .with_context(|| { - format!( - "'FromPendingCertificateMessageAdapter' can not json hex decode the verification key signature: '{}'", - verification_key_signature - ) - })?, - ), - _ => None, - }, - match &msg.operational_certificate { - Some(operational_certificate) => Some( - ProtocolOpCert::from_json_hex(operational_certificate).with_context(|| { - format!( - "'FromPendingCertificateMessageAdapter' can not json hex decode the operational certificate: '{}'", - operational_certificate - ) - })?, - ), - _ => None, - }, - msg.kes_period, - ); - signers.push(signer); - } - - Ok(signers) -} - impl TryFromMessageAdapter for FromPendingCertificateMessageAdapter { /// Adapter method - #[allow(deprecated)] fn try_adapt(message: CertificatePendingMessage) -> StdResult { let certificate = CertificatePending { epoch: message.epoch, signed_entity_type: message.signed_entity_type, protocol_parameters: message.protocol_parameters, next_protocol_parameters: message.next_protocol_parameters, - signers: to_signers(&message.signers).with_context(|| { - format!( - "'FromPendingCertificateMessageAdapter' can not convert the list of current signers: '{:?}'", - message.signers - ) - })?, - next_signers: to_signers(&message.next_signers).with_context(|| { - format!( - "'FromPendingCertificateMessageAdapter' can not convert the list of next signers: '{:?}'", - message.next_signers - ) - })?, + // This field is deprecated and should not be used in Signer. + signers: vec![], + // This field is deprecated and should not be used in Signer. + next_signers: vec![], }; Ok(certificate) @@ -92,14 +41,4 @@ mod tests { assert_eq!(epoch, certificate_pending.epoch); } - - #[test] - fn adapt_signers() { - let mut message = CertificatePendingMessage::dummy(); - message.signers = vec![SignerMessagePart::dummy(), SignerMessagePart::dummy()]; - let certificate_pending = FromPendingCertificateMessageAdapter::try_adapt(message).unwrap(); - - assert_eq!(2, certificate_pending.signers.len()); - assert_eq!(1, certificate_pending.next_signers.len()); - } }