removed getset from output index and changed to u16

Author: Oscar-Pepper

zingo-sync/src/scan/compact_blocks.rs

@@ -294,11 +294,11 @@ fn calculate_sapling_leaves_and_retentions<D: Domain>(
     last_outputs_in_block: bool,
     incoming_decrypted_outputs: &HashMap<OutputId, DecryptedOutput<D, ()>>,
 ) -> Result<Vec<(Node, Retention<BlockHeight>)>, ()> {
-    let incoming_output_indices: Vec<usize> = incoming_decrypted_outputs
+    let incoming_output_indexes = incoming_decrypted_outputs
         .keys()
         .copied()
         .map(|output_id| output_id.output_index())
-        .collect();
+        .collect::<Vec<_>>();
 
     if outputs.is_empty() {
         Ok(Vec::new())
@@ -314,7 +314,7 @@ fn calculate_sapling_leaves_and_retentions<D: Domain>(
 
                 let last_output_in_block: bool =
                     last_outputs_in_block && output_index == last_output_index;
-                let decrypted: bool = incoming_output_indices.contains(&output_index);
+                let decrypted: bool = incoming_output_indexes.contains(&(output_index as u16));
                 let retention = match (decrypted, last_output_in_block) {
                     (is_marked, true) => Retention::Checkpoint {
                         id: block_height,
@@ -342,11 +342,11 @@ fn calculate_orchard_leaves_and_retentions<D: Domain>(
     last_outputs_in_block: bool,
     incoming_decrypted_outputs: &HashMap<OutputId, DecryptedOutput<D, ()>>,
 ) -> Result<Vec<(MerkleHashOrchard, Retention<BlockHeight>)>, ()> {
-    let incoming_output_indices: Vec<usize> = incoming_decrypted_outputs
+    let incoming_output_indexes = incoming_decrypted_outputs
         .keys()
         .copied()
         .map(|output_id| output_id.output_index())
-        .collect();
+        .collect::<Vec<_>>();
 
     if actions.is_empty() {
         Ok(Vec::new())
@@ -362,7 +362,7 @@ fn calculate_orchard_leaves_and_retentions<D: Domain>(
 
                 let last_output_in_block: bool =
                     last_outputs_in_block && output_index == last_output_index;
-                let decrypted: bool = incoming_output_indices.contains(&output_index);
+                let decrypted: bool = incoming_output_indexes.contains(&(output_index as u16));
                 let retention = match (decrypted, last_output_in_block) {
                     (is_marked, true) => Retention::Checkpoint {
                         id: block_height,

zingo-sync/src/scan/transactions.rs

@@ -323,7 +323,7 @@ fn scan_incoming_coins<P: consensus::Parameters>(
         if let Some(address) = output.recipient_address() {
             let encoded_address = keys::transparent::encode_address(consensus_parameters, address);
             if let Some((address, key_id)) = transparent_addresses.get_key_value(&encoded_address) {
-                let output_id = OutputId::from_parts(txid, output_index);
+                let output_id = OutputId::from_parts(txid, output_index as u16);
 
                 transparent_coins.push(TransparentCoin::from_parts(
                     output_id,
@@ -358,7 +358,7 @@ where
         .enumerate()
     {
         if let Some(((note, _, memo_bytes), key_index)) = output {
-            let output_id = OutputId::from_parts(txid, output_index);
+            let output_id = OutputId::from_parts(txid, output_index as u16);
             let (nullifier, position) = nullifiers_and_positions.map_or((None, None), |m| {
                 m.get(&output_id)
                     .map(|(nf, pos)| (Some(*nf), Some(*pos)))
@@ -401,7 +401,7 @@ where
             &output.out_ciphertext(),
         ) {
             outgoing_notes.push(OutgoingNote::from_parts(
-                OutputId::from_parts(txid, output_index),
+                OutputId::from_parts(txid, output_index as u16),
                 key_ids[key_index],
                 note,
                 Memo::from_bytes(memo_bytes.as_ref()).unwrap(),

zingolib/src/wallet/data.rs

@@ -1771,7 +1771,7 @@ pub mod summaries {
     /// Not to be used for internal logic in the system.
     #[derive(Clone, PartialEq, Debug)]
     pub struct OutgoingNoteSummary {
-        pub output_index: usize,
+        pub output_index: u16,
         pub key_id: KeyId,
         pub value: u64,
         pub memo: Option<String>,

zingolib/src/wallet/zcb_traits.rs

@@ -515,12 +515,12 @@ impl InputSource for LightWallet {
         let exclude_sapling = exclude
             .iter()
             .filter(|&note_id| note_id.protocol() == ShieldedProtocol::Sapling)
-            .map(|note_id| OutputId::from_parts(*note_id.txid(), note_id.output_index() as usize))
+            .map(|note_id| OutputId::from_parts(*note_id.txid(), note_id.output_index()))
             .collect::<Vec<_>>();
         let exclude_orchard = exclude
             .iter()
             .filter(|&note_id| note_id.protocol() == ShieldedProtocol::Orchard)
-            .map(|note_id| OutputId::from_parts(*note_id.txid(), note_id.output_index() as usize))
+            .map(|note_id| OutputId::from_parts(*note_id.txid(), note_id.output_index()))
             .collect::<Vec<_>>();
         let mut remaining_value_needed = RemainingNeeded::Positive(target_value);