Cleanup URI usage

Author: adityapk00

lib/src/blaze/block_witness_data.rs

@@ -440,22 +440,13 @@ impl BlockAndWitnessData {
         let prev_height = { u64::from(height) - 1 };
 
         let (cb, mut tree) = {
-            let tree = {
-                let maybe_tree = if prev_height < self.sapling_activation_height {
-                    Some(CommitmentTree::empty())
-                } else {
-                    None
-                };
-
-                match maybe_tree {
-                    Some(t) => t,
-                    None => {
-                        let tree_state = GrpcConnector::get_sapling_tree(uri, prev_height).await?;
-                        let sapling_tree = hex::decode(&tree_state.tree).unwrap();
-                        self.verification_list.write().await.push(tree_state);
-                        CommitmentTree::read(&sapling_tree[..]).map_err(|e| format!("{}", e))?
-                    }
-                }
+            let tree = if prev_height < self.sapling_activation_height {
+                CommitmentTree::empty()
+            } else {
+                let tree_state = GrpcConnector::get_sapling_tree(uri, prev_height).await?;
+                let sapling_tree = hex::decode(&tree_state.tree).unwrap();
+                self.verification_list.write().await.push(tree_state);
+                CommitmentTree::read(&sapling_tree[..]).map_err(|e| format!("{}", e))?
             };
 
             // Get the current compact block

lib/src/blaze/syncdata.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use http::Uri;
 use tokio::sync::RwLock;
 
 use super::{block_witness_data::BlockAndWitnessData, sync_status::SyncStatus};
@@ -8,8 +9,8 @@ use crate::{lightclient::lightclient_config::LightClientConfig, lightwallet::dat
 
 pub struct BlazeSyncData {
     pub(crate) sync_status: Arc<RwLock<SyncStatus>>,
-
     pub(crate) block_data: BlockAndWitnessData,
+    uri: Uri,
 }
 
 impl BlazeSyncData {
@@ -18,10 +19,15 @@ impl BlazeSyncData {
 
         Self {
             sync_status: sync_status.clone(),
+            uri: config.server.clone(),
             block_data: BlockAndWitnessData::new(config, sync_status),
         }
     }
 
+    pub fn uri(&self) -> &'_ Uri {
+        &self.uri
+    }
+
     pub async fn setup_for_sync(
         &mut self,
         start_block: u64,

lib/src/blaze/trial_decryptions.rs

@@ -3,7 +3,6 @@ use crate::{
     lightwallet::{data::WalletTx, keys::Keys, wallet_txns::WalletTxns},
 };
 use futures::future;
-use http::Uri;
 use log::info;
 use std::sync::Arc;
 use tokio::{
@@ -35,7 +34,6 @@ impl TrialDecryptions {
 
     pub async fn start(
         &self,
-        uri: Uri,
         bsync_data: Arc<RwLock<BlazeSyncData>>,
         detected_txid_sender: UnboundedSender<(TxId, Nullifier, BlockHeight, Option<u32>)>,
     ) -> (JoinHandle<()>, UnboundedSender<CompactBlock>) {
@@ -67,12 +65,10 @@ impl TrialDecryptions {
                 let ivks = ivks.clone();
                 let wallet_txns = wallet_txns.clone();
                 let bsync_data = bsync_data.clone();
-                let uri = uri.clone();
 
                 let detected_txid_sender = detected_txid_sender.clone();
 
                 tasks.push(tokio::spawn(async move {
-                    let keys = keys.read().await;
                     let height = BlockHeight::from_u32(cb.height as u32);
 
                     for (tx_num, ctx) in cb.vtx.iter().enumerate() {
@@ -84,20 +80,22 @@ impl TrialDecryptions {
                                 if let Some((note, to)) = try_sapling_compact_note_decryption(
                                     &MAIN_NETWORK,
                                     height,
-                                    ivk,
+                                    &ivk,
                                     &epk,
                                     &cmu,
                                     &co.ciphertext,
                                 ) {
+                                    let keys = keys.read().await;
                                     let extfvk = keys.zkeys[i].extfvk();
                                     let have_spending_key = keys.have_spending_key(extfvk);
+                                    let uri = bsync_data.read().await.uri().clone();
 
                                     // Get the witness for the note
                                     let witness = bsync_data
                                         .read()
                                         .await
                                         .block_data
-                                        .get_note_witness(uri.clone(), height, tx_num, output_num)
+                                        .get_note_witness(uri, height, tx_num, output_num)
                                         .await?;
 
                                     let txid = WalletTx::new_txid(&ctx.hash);

lib/src/lightclient.rs

@@ -1361,7 +1361,7 @@ impl LightClient {
         // Do Trial decryptions of all the sapling outputs, and pass on the successful ones to the update_notes processor
         let trial_decryptions_processor = TrialDecryptions::new(self.wallet.keys(), self.wallet.txns());
         let (trial_decrypts_handle, trial_decrypts_tx) = trial_decryptions_processor
-            .start(uri.clone(), bsync_data.clone(), detected_txns_tx)
+            .start(bsync_data.clone(), detected_txns_tx)
             .await;
 
         // Fetch Compact blocks and send them to nullifier cache, node-and-witness cache and the trial-decryption processor