refactor(common+aggregator): make CertificateChainFixture certificate conversions more idiomatic using TryFrom

Author: dlachaume

mithril-aggregator/src/database/query/certificate/insert_certificate.rs

@@ -40,7 +40,7 @@ impl Query for InsertCertificateRecordQuery {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::{entities::Certificate, test::crypto_helper::setup_certificate_chain};
+    use mithril_common::test::crypto_helper::setup_certificate_chain;
     use mithril_persistence::sqlite::ConnectionExtensions;
 
     use crate::database::test_helper::main_db_connection;
@@ -67,9 +67,7 @@ mod tests {
     #[test]
     fn test_insert_many_certificates_records() {
         let certificates = setup_certificate_chain(5, 2);
-        let certificates: Vec<Certificate> = certificates.into();
-        let certificates_records: Vec<CertificateRecord> =
-            certificates.into_iter().map(|c| c.try_into().unwrap()).collect();
+        let certificates_records: Vec<CertificateRecord> = certificates.try_into().unwrap();
 
         let connection = main_db_connection().unwrap();
 

mithril-aggregator/src/database/query/certificate/insert_or_replace_certificate.rs

@@ -38,7 +38,7 @@ impl Query for InsertOrReplaceCertificateRecordQuery {
 mod tests {
     use std::collections::HashMap;
 
-    use mithril_common::entities::{Certificate, Epoch};
+    use mithril_common::entities::Epoch;
     use mithril_common::test::{crypto_helper::setup_certificate_chain, double::fake_data};
     use mithril_persistence::sqlite::ConnectionExtensions;
 
@@ -50,9 +50,7 @@ mod tests {
     #[test]
     fn test_insert_many_certificates_records_in_empty_db() {
         let certificates = setup_certificate_chain(5, 2);
-        let certificates: Vec<Certificate> = certificates.into();
-        let certificates_records: Vec<CertificateRecord> =
-            certificates.into_iter().map(|c| c.try_into().unwrap()).collect();
+        let certificates_records: Vec<CertificateRecord> = certificates.try_into().unwrap();
 
         let connection = main_db_connection().unwrap();
 

mithril-common/src/test/builder/certificate_chain_builder.rs

@@ -123,9 +123,11 @@ impl DerefMut for CertificateChainFixture {
     }
 }
 
-impl<C: From<Certificate>> From<CertificateChainFixture> for Vec<C> {
-    fn from(fixture: CertificateChainFixture) -> Self {
-        fixture.certificates_chained.into_iter().map(C::from).collect()
+impl<C: TryFrom<Certificate>> TryFrom<CertificateChainFixture> for Vec<C> {
+    type Error = C::Error;
+
+    fn try_from(fixture: CertificateChainFixture) -> Result<Self, Self::Error> {
+        fixture.certificates_chained.into_iter().map(C::try_from).collect()
     }
 }