Drop scorer lock after find_route

If we do not do that, the lock will not be released for `retry_payment`.

Author: jurvis

lightning-invoice/src/payment.rs

@@ -532,12 +532,15 @@ where
 				HashMap::new()
 			}
 		};
-		let scorer = AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs };
 
-		let route = self.router.find_route(
-			&payer, params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
-			&scorer
-		).map_err(|e| PaymentError::Routing(e))?;
+		let route = {
+			let scorer = AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs };
+
+			self.router.find_route(
+				&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
+				&scorer
+			).map_err(|e| PaymentError::Routing(e))?
+		};
 
 		match send_payment(&route) {
 			Ok(payment_id) => {
@@ -691,18 +694,23 @@ where
 				HashMap::new()
 			}
 		};
-		let scorer = AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs };
 
-		let route = self.router.find_route(
-			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
-			&scorer
-		);
+		let route = {
+			let scorer = AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs };
+
+			self.router.find_route(
+				&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
+				&scorer
+			)
+		};
+
 
 		if route.is_err() {
 			log_trace!(self.logger, "Failed to find a route for payment {}; not retrying ({:})", log_bytes!(payment_hash.0), attempts);
 			return Err(());
 		}
 
+
 		match self.payer.retry_payment(&route.unwrap(), payment_id) {
 			Ok(()) => Ok(()),
 			Err(PaymentSendFailure::ParameterError(_)) |