Add MKMap::new_from_iter to construct an MKMap with reduced copies

Author: Alenar

mithril-aggregator/src/services/prover.rs

@@ -79,7 +79,7 @@ impl MithrilProverService {
                 .or_default()
                 .push(transaction.transaction_hash);
         }
-        let mk_hash_map = MKMap::new(
+        let mk_hash_map = MKMap::new_from_iter(
             transactions_by_block_ranges
                 .into_iter()
                 .try_fold(
@@ -88,8 +88,7 @@ impl MithrilProverService {
                         acc.push((block_range, MKTree::new(&transactions)?.into()));
                         Ok(acc)
                     },
-                )?
-                .as_slice(),
+                )?,
         )
         .with_context(|| "ProverService failed to compute the merkelized structure that proves ownership of the transaction")?;
 

mithril-common/src/crypto_helper/merkle_map.rs

@@ -39,15 +39,20 @@ pub struct MKMap<K: MKMapKey, V: MKMapValue<K>> {
 impl<K: MKMapKey, V: MKMapValue<K>> MKMap<K, V> {
     /// MKMap factory
     pub fn new(entries: &[(K, V)]) -> StdResult<Self> {
+        Self::new_from_iter(entries.to_vec())
+    }
+
+    /// MKMap factory
+    pub fn new_from_iter<T: IntoIterator<Item = (K, V)>>(entries: T) -> StdResult<Self> {
         let inner_map_values = BTreeMap::default();
         let inner_merkle_tree = MKTree::new::<MKTreeNode>(&[])?;
         let mut mk_map = Self {
             inner_map_values,
             inner_merkle_tree,
         };
-        let sorted_entries = BTreeMap::from_iter(entries.to_vec());
+        let sorted_entries = BTreeMap::from_iter(entries);
         for (key, value) in sorted_entries {
-            mk_map.insert_unchecked(key.clone(), value.clone())?;
+            mk_map.insert_unchecked(key, value)?;
         }
 
         Ok(mk_map)
@@ -394,7 +399,7 @@ mod tests {
             .map(|(range, mktree)| (range.to_owned(), mktree.into()))
             .collect::<Vec<(_, MKMapNode<_>)>>();
         let mk_map_nodes = MKMap::new(merkle_tree_node_entries.as_slice()).unwrap();
-        let mk_map_full = MKMap::new(merkle_tree_full_entries.as_slice()).unwrap();
+        let mk_map_full = MKMap::new(merkle_tree_full_entries).unwrap();
 
         let mk_map_nodes_root = mk_map_nodes.compute_root().unwrap();
         let mk_map_full_root = mk_map_full.compute_root().unwrap();

mithril-common/src/signable_builder/cardano_transactions.rs

@@ -46,7 +46,7 @@ impl CardanoTransactionsSignableBuilder {
     // This will be not be the case when we use the cached intermediate merkle roots.
     fn compute_merkle_map_from_transactions(
         &self,
-        transactions: &[CardanoTransaction],
+        transactions: Vec<CardanoTransaction>,
     ) -> StdResult<MKMap<BlockRange, MKMapNode<BlockRange>>> {
         let mut transactions_by_block_ranges: HashMap<BlockRange, Vec<TransactionHash>> =
             HashMap::new();
@@ -55,9 +55,9 @@ impl CardanoTransactionsSignableBuilder {
             transactions_by_block_ranges
                 .entry(block_range)
                 .or_default()
-                .push(transaction.transaction_hash.to_owned());
+                .push(transaction.transaction_hash);
         }
-        let mk_hash_map = MKMap::new(
+        let mk_hash_map = MKMap::new_from_iter(
             transactions_by_block_ranges
                 .into_iter()
                 .try_fold(
@@ -66,15 +66,14 @@ impl CardanoTransactionsSignableBuilder {
                         acc.push((block_range, MKTree::new(&transactions)?.into()));
                         Ok(acc)
                     },
-                )?
-                .as_slice(),
+                )?,
         )
         .with_context(|| "ProverService failed to compute the merkelized structure that proves ownership of the transaction")?;
 
         Ok(mk_hash_map)
     }
 
-    fn compute_merkle_root(&self, transactions: &[CardanoTransaction]) -> StdResult<MKTreeNode> {
+    fn compute_merkle_root(&self, transactions: Vec<CardanoTransaction>) -> StdResult<MKTreeNode> {
         let mk_map = self.compute_merkle_map_from_transactions(transactions)?;
 
         let mk_root = mk_map.compute_root().with_context(|| {
@@ -100,7 +99,7 @@ impl SignableBuilder<CardanoDbBeacon> for CardanoTransactionsSignableBuilder {
             .transaction_importer
             .import(beacon.immutable_file_number)
             .await?;
-        let mk_root = self.compute_merkle_root(&transactions)?;
+        let mk_root = self.compute_merkle_root(transactions)?;
 
         let mut protocol_message = ProtocolMessage::new();
         protocol_message.set_message_part(
@@ -153,7 +152,7 @@ mod tests {
         );
 
         let merkle_root_reference = cardano_transaction_signable_builder
-            .compute_merkle_root(&[
+            .compute_merkle_root(vec![
                 transaction_1.clone(),
                 transaction_2.clone(),
                 transaction_3.clone(),
@@ -163,14 +162,14 @@ mod tests {
         {
             let transactions_set = vec![transaction_1.clone()];
             let mk_root = cardano_transaction_signable_builder
-                .compute_merkle_root(&transactions_set)
+                .compute_merkle_root(transactions_set)
                 .unwrap();
             assert_ne!(merkle_root_reference, mk_root);
         }
         {
             let transactions_set = vec![transaction_1.clone(), transaction_2.clone()];
             let mk_root = cardano_transaction_signable_builder
-                .compute_merkle_root(&transactions_set)
+                .compute_merkle_root(transactions_set)
                 .unwrap();
             assert_ne!(merkle_root_reference, mk_root);
         }
@@ -182,7 +181,7 @@ mod tests {
                 transaction_4.clone(),
             ];
             let mk_root = cardano_transaction_signable_builder
-                .compute_merkle_root(&transactions_set)
+                .compute_merkle_root(transactions_set)
                 .unwrap();
             assert_ne!(merkle_root_reference, mk_root);
         }
@@ -195,7 +194,7 @@ mod tests {
                 transaction_2.clone(),
             ];
             let mk_root = cardano_transaction_signable_builder
-                .compute_merkle_root(&transactions_set)
+                .compute_merkle_root(transactions_set)
                 .unwrap();
             assert_ne!(merkle_root_reference, mk_root);
         }
@@ -214,11 +213,11 @@ mod tests {
         );
 
         let merkle_root_reference = cardano_transaction_signable_builder
-            .compute_merkle_root(&[transaction_1.clone(), transaction_2.clone()])
+            .compute_merkle_root(vec![transaction_1.clone(), transaction_2.clone()])
             .unwrap();
 
         let mk_root = cardano_transaction_signable_builder
-            .compute_merkle_root(&[transaction_2.clone(), transaction_1.clone()])
+            .compute_merkle_root(vec![transaction_2.clone(), transaction_1.clone()])
             .unwrap();
 
         assert_eq!(merkle_root_reference, mk_root);
@@ -254,7 +253,7 @@ mod tests {
 
         // Assert
         let mk_root = cardano_transactions_signable_builder
-            .compute_merkle_root(&transactions)
+            .compute_merkle_root(transactions)
             .unwrap();
         let mut signable_expected = ProtocolMessage::new();
         signable_expected.set_message_part(