f Avoid double-lock of best block

Author: tnull

src/sweep.rs

@@ -61,10 +61,12 @@ where
 	pub(crate) fn add_outputs(&self, output_descriptors: Vec<SpendableOutputDescriptor>) {
 		let mut locked_outputs = self.outputs.lock().unwrap();
 
-		let (spending_tx, broadcast_height) = match self.get_spending_tx(&output_descriptors) {
+		let cur_height = self.best_block.lock().unwrap().height();
+
+		let (spending_tx, broadcast_height) = match self.get_spending_tx(&output_descriptors, cur_height) {
 			Ok(Some(spending_tx)) => {
 				self.wallet.broadcast_transactions(&[&spending_tx]);
-				(Some(spending_tx), Some(self.best_block.lock().unwrap().height()))
+				(Some(spending_tx), Some(cur_height))
 			}
 			Ok(None) => {
 				log_debug!(
@@ -101,15 +103,14 @@ where
 	}
 
 	fn get_spending_tx(
-		&self, output_descriptors: &Vec<SpendableOutputDescriptor>,
+		&self, output_descriptors: &Vec<SpendableOutputDescriptor>, cur_height: u32,
 	) -> Result<Option<Transaction>, ()> {
 		let tx_feerate = self.wallet.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
 
 		let destination_address = self.wallet.get_new_address().map_err(|e| {
 			log_error!(self.logger, "Failed to get destination address from wallet: {}", e);
 		})?;
 
-		let cur_height = self.best_block.lock().unwrap().height();
 		let locktime: PackedLockTime =
 			LockTime::from_height(cur_height).map_or(PackedLockTime::ZERO, |l| l.into());