refactor: add type conversion generic to CardanoTransactionsSetProof factory

Author: jpraynaud

mithril-aggregator/src/message_adapters/to_cardano_transactions_proof_message.rs

@@ -82,10 +82,7 @@ mod tests {
             .chunks(2)
             .map(|transaction_hashes_in_chunk| {
                 let mk_proof = MKProof::from_leaves(transaction_hashes_in_chunk).unwrap();
-                CardanoTransactionsSetProof::new(
-                    transaction_hashes_in_chunk.to_vec(),
-                    mk_proof.into(),
-                )
+                CardanoTransactionsSetProof::new(transaction_hashes_in_chunk.to_vec(), mk_proof)
             })
             .collect::<Vec<_>>();
 

mithril-common/src/entities/cardano_transactions_set_proof.rs

@@ -17,13 +17,13 @@ pub struct CardanoTransactionsSetProof {
 
 impl CardanoTransactionsSetProof {
     /// CardanoTransactionsSetProof factory
-    pub fn new(
+    pub fn new<T: Into<MKMapProof<BlockRange>>>(
         transactions_hashes: Vec<TransactionHash>,
-        transactions_proof: MKMapProof<BlockRange>,
+        transactions_proof: T,
     ) -> Self {
         Self {
             transactions_hashes,
-            transactions_proof: ProtocolMkProof::new(transactions_proof),
+            transactions_proof: ProtocolMkProof::new(transactions_proof.into()),
         }
     }
 

mithril-common/src/messages/cardano_transactions_proof.rs

@@ -264,7 +264,7 @@ mod tests {
     fn verify_invalid_proofs() {
         let set_proof = CardanoTransactionsSetProof::new(
             vec!["invalid1".to_string()],
-            MKProof::from_leaves(&["invalid2"]).unwrap().into(),
+            MKProof::from_leaves(&["invalid2"]).unwrap(),
         );
         let txs_proofs = CardanoTransactionsProofsMessage::new(
             "whatever",
@@ -292,11 +292,11 @@ mod tests {
         let set_proofs = vec![
             CardanoTransactionsSetProof::new(
                 vec!["tx-1".to_string()],
-                MKProof::from_leaves(&["tx-1"]).unwrap().into(),
+                MKProof::from_leaves(&["tx-1"]).unwrap(),
             ),
             CardanoTransactionsSetProof::new(
                 vec!["tx-2".to_string()],
-                MKProof::from_leaves(&["tx-2"]).unwrap().into(),
+                MKProof::from_leaves(&["tx-2"]).unwrap(),
             ),
         ];
         let txs_proofs = CardanoTransactionsProofsMessage::new(
@@ -356,7 +356,7 @@ mod tests {
             .collect::<Vec<_>>();
 
         let proof = MKProof::from_leaves(transactions).unwrap();
-        let set_proof = CardanoTransactionsSetProof::new(transactions_hashes, proof.into());
+        let set_proof = CardanoTransactionsSetProof::new(transactions_hashes, proof);
 
         let verified_transactions_fake = VerifiedCardanoTransactions {
             certificate_hash: "whatever".to_string(),