X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Foutbound_payment.rs;h=b05d6f3f7290110b5aed103faef370203350a8fc;hb=ad91fcd510d7620df438a4cf59f7ed7b080adb19;hp=db8b43e3f67778239b3d98d437122565d7ffa7ec;hpb=7c9463668a4f71663746e57bdb09ee6b91797d5a;p=rust-lightning

diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index db8b43e3..b05d6f3f 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -171,7 +171,7 @@ impl PendingOutboundPayment {
 	}
 
 	fn mark_fulfilled(&mut self) {
-		let mut session_privs = HashSet::new();
+		let mut session_privs = new_hash_set();
 		core::mem::swap(&mut session_privs, match self {
 			PendingOutboundPayment::Legacy { session_privs } |
 				PendingOutboundPayment::Retryable { session_privs, .. } |
@@ -186,7 +186,7 @@ impl PendingOutboundPayment {
 
 	fn mark_abandoned(&mut self, reason: PaymentFailureReason) {
 		if let PendingOutboundPayment::Retryable { session_privs, payment_hash, .. } = self {
-			let mut our_session_privs = HashSet::new();
+			let mut our_session_privs = new_hash_set();
 			core::mem::swap(&mut our_session_privs, session_privs);
 			*self = PendingOutboundPayment::Abandoned {
 				session_privs: our_session_privs,
@@ -195,7 +195,7 @@ impl PendingOutboundPayment {
 			};
 		} else if let PendingOutboundPayment::InvoiceReceived { payment_hash, .. } = self {
 			*self = PendingOutboundPayment::Abandoned {
-				session_privs: HashSet::new(),
+				session_privs: new_hash_set(),
 				payment_hash: *payment_hash,
 				reason: Some(reason)
 			};
@@ -675,7 +675,7 @@ pub(super) struct OutboundPayments {
 impl OutboundPayments {
 	pub(super) fn new() -> Self {
 		Self {
-			pending_outbound_payments: Mutex::new(HashMap::new()),
+			pending_outbound_payments: Mutex::new(new_hash_map()),
 			retry_lock: Mutex::new(()),
 		}
 	}
@@ -1268,7 +1268,7 @@ impl OutboundPayments {
 			retry_strategy,
 			attempts: PaymentAttempts::new(),
 			payment_params,
-			session_privs: HashSet::new(),
+			session_privs: new_hash_set(),
 			pending_amt_msat: 0,
 			pending_fee_msat: Some(0),
 			payment_hash,
@@ -2283,65 +2283,6 @@ mod tests {
 		assert!(pending_events.lock().unwrap().is_empty());
 	}
 
-	#[test]
-	fn fails_paying_for_bolt12_invoice() {
-		let logger = test_utils::TestLogger::new();
-		let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
-		let scorer = RwLock::new(test_utils::TestScorer::new());
-		let router = test_utils::TestRouter::new(network_graph, &logger, &scorer);
-		let keys_manager = test_utils::TestKeysInterface::new(&[0; 32], Network::Testnet);
-
-		let pending_events = Mutex::new(VecDeque::new());
-		let outbound_payments = OutboundPayments::new();
-		let payment_id = PaymentId([0; 32]);
-		let expiration = StaleExpiration::AbsoluteTimeout(Duration::from_secs(100));
-
-		let invoice = OfferBuilder::new("foo".into(), recipient_pubkey())
-			.amount_msats(1000)
-			.build().unwrap()
-			.request_invoice(vec![1; 32], payer_pubkey()).unwrap()
-			.build().unwrap()
-			.sign(payer_sign).unwrap()
-			.respond_with_no_std(payment_paths(), payment_hash(), now()).unwrap()
-			.build().unwrap()
-			.sign(recipient_sign).unwrap();
-
-		assert!(
-			outbound_payments.add_new_awaiting_invoice(
-				payment_id, expiration, Retry::Attempts(0),
-				Some(invoice.amount_msats() / 100 + 50_000)
-			).is_ok()
-		);
-		assert!(outbound_payments.has_pending_payments());
-
-		let route_params = RouteParameters::from_payment_params_and_value(
-			PaymentParameters::from_bolt12_invoice(&invoice),
-			invoice.amount_msats(),
-		);
-		router.expect_find_route(
-			route_params.clone(), Ok(Route { paths: vec![], route_params: Some(route_params) })
-		);
-
-		assert_eq!(
-			outbound_payments.send_payment_for_bolt12_invoice(
-				&invoice, payment_id, &&router, vec![], || InFlightHtlcs::new(), &&keys_manager,
-				&&keys_manager, 0, &&logger, &pending_events, |_| panic!()
-			),
-			Ok(()),
-		);
-		assert!(!outbound_payments.has_pending_payments());
-
-		let payment_hash = invoice.payment_hash();
-		let reason = Some(PaymentFailureReason::UnexpectedError);
-
-		assert!(!pending_events.lock().unwrap().is_empty());
-		assert_eq!(
-			pending_events.lock().unwrap().pop_front(),
-			Some((Event::PaymentFailed { payment_id, payment_hash, reason }, None)),
-		);
-		assert!(pending_events.lock().unwrap().is_empty());
-	}
-
 	#[test]
 	fn sends_payment_for_bolt12_invoice() {
 		let logger = test_utils::TestLogger::new();