Merge pull request PIVX-Labs#93 from panleone/avoid_copy

Optimize handle_transaction
panleone · Oct 25, 2024 · 3400f21 · 3400f21
2 parents 5080fc9 + a24a2d1
commit 3400f21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/transaction.rs b/src/transaction.rs
@@ -156,16 +156,16 @@ pub fn handle_transaction(
             (note, IncrementalWitness::read(wit).unwrap())
         })
         .collect::<Vec<_>>();
-    let nullifiers = handle_transaction_internal(&mut tree, tx, &key, true, &mut comp_note)
+    let nullifiers = handle_transaction_internal(&mut tree, tx, key, true, &mut comp_note)
         .map_err(|_| "Cannot decode tx")?;
     let mut ser_comp_note: Vec<(Note, String)> = vec![];
     let mut ser_nullifiers: Vec<String> = vec![];
-    for (note, witness) in comp_note.iter() {
+    for (note, witness) in comp_note {
         let mut buff = Vec::new();
         witness
             .write(&mut buff)
             .map_err(|_| "Cannot write witness to buffer")?;
-        ser_comp_note.push((note.clone(), hex::encode(&buff)));
+        ser_comp_note.push((note, hex::encode(&buff)));
     }
 
     for nullif in nullifiers.iter() {
@@ -188,7 +188,7 @@ pub fn handle_transaction(
 pub fn handle_transaction_internal(
     tree: &mut CommitmentTree<Node>,
     tx: &str,
-    key: &UnifiedFullViewingKey,
+    key: UnifiedFullViewingKey,
     is_testnet: bool,
     witnesses: &mut Vec<(Note, IncrementalWitness<Node>)>,
 ) -> Result<Vec<Nullifier>, Box<dyn Error>> {
@@ -197,8 +197,8 @@ pub fn handle_transaction_internal(
         pivx_primitives::consensus::BranchId::Sapling,
     )?;
     let mut hash = HashMap::new();
-    hash.insert(AccountId::default(), key.clone());
-    let decrypted_tx = if is_testnet {
+    hash.insert(AccountId::default(), key);
+    let mut decrypted_tx = if is_testnet {
         decrypt_transaction(&TEST_NETWORK, BlockHeight::from_u32(320), &tx, &hash)
     } else {
         decrypt_transaction(&MAIN_NETWORK, BlockHeight::from_u32(320), &tx, &hash)
@@ -218,11 +218,12 @@ pub fn handle_transaction_internal(
                     .append(Node::from_cmu(out.cmu()))
                     .map_err(|_| "Failed to add cmu to witness")?;
             }
-            for note in &decrypted_tx {
+            for (index, note) in decrypted_tx.iter().enumerate() {
                 if note.index == i {
                     // Save witness
                     let witness = IncrementalWitness::from_tree(tree);
-                    witnesses.push((note.note.clone(), witness));
+                    witnesses.push((decrypted_tx.swap_remove(index).note, witness));
+                    break;
                 }
             }
         }

diff --git a/src/transaction/test.rs b/src/transaction/test.rs
@@ -29,8 +29,7 @@ fn check_tx_decryption() {
     let key = UnifiedFullViewingKey::new(Some(skey.to_diversifiable_full_viewing_key()), None)
         .expect("Failed to create key");
     let mut comp_note = vec![];
-    let nullifiers =
-        handle_transaction_internal(&mut tree, tx, &key, true, &mut comp_note).unwrap();
+    let nullifiers = handle_transaction_internal(&mut tree, tx, key, true, &mut comp_note).unwrap();
     //This was a t-s tx
     assert_eq!(nullifiers.len(), 0);
     //Successfully decrypt exactly 1 note
@@ -86,7 +85,7 @@ pub async fn test_create_transaction() -> Result<(), Box<dyn Error>> {
 
     let mut notes = vec![];
     let _nullifiers =
-        handle_transaction_internal(&mut commitment_tree, input_tx, &key, true, &mut notes)?;
+        handle_transaction_internal(&mut commitment_tree, input_tx, key, true, &mut notes)?;
     assert_eq!(notes.len(), 1);
     let (note, path) = &notes[0];
     let mut path_vec = vec![];