f support None route params and test

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -4602,14 +4602,20 @@ where
 	}
 
 	/// Sends a payment along a given route. See [`Self::send_payment`] for more info.
-	/// [`Route::route_params`] is required to be `Some`.
 	pub fn send_payment_with_route(
-		&self, route: Route, payment_hash: PaymentHash, recipient_onion: RecipientOnionFields,
+		&self, mut route: Route, payment_hash: PaymentHash, recipient_onion: RecipientOnionFields,
 		payment_id: PaymentId
 	) -> Result<(), RetryableSendFailure> {
 		let best_block_height = self.best_block.read().unwrap().height;
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);
-		let route_params = route.route_params.clone().ok_or(RetryableSendFailure::RouteNotFound)?;
+		let route_params = route.route_params.clone().unwrap_or_else(|| {
+			// Create a dummy since route params are a required parameter but unused in this case
+			let payment_params = PaymentParameters::from_node_id(
+				self.get_our_node_id(), MIN_FINAL_CLTV_EXPIRY_DELTA as u32
+			);
+			RouteParameters::from_payment_params_and_value(payment_params, route.get_total_amount())
+		});
+		if route.route_params.is_none() { route.route_params = Some(route_params.clone()); }
 		self.router.route_cache.lock().unwrap().insert(payment_id, route);
 		self.pending_outbound_payments
 			.send_payment(payment_hash, recipient_onion, payment_id, Retry::Attempts(0),

lightning/src/ln/payment_tests.rs

@@ -4450,3 +4450,32 @@ fn remove_pending_outbound_probe_on_buggy_path() {
 	);
 	assert!(nodes[0].node.list_recent_payments().is_empty());
 }
+
+#[test]
+fn pay_route_without_params() {
+	// Make sure we can use ChannelManager::send_payment_with_route to pay a route where
+	// Route::route_parameters is None.
+	let chanmon_cfgs = create_chanmon_cfgs(2);
+	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+	create_announced_chan_between_nodes(&nodes, 0, 1);
+
+	let amt_msat = 10_000;
+	let payment_params = PaymentParameters::from_node_id(nodes[1].node.get_our_node_id(), TEST_FINAL_CLTV)
+		.with_bolt11_features(nodes[1].node.bolt11_invoice_features()).unwrap();
+	let (mut route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], payment_params, amt_msat);
+	route.route_params.take();
+	nodes[0].node.send_payment_with_route(
+		route, payment_hash, RecipientOnionFields::secret_only(payment_secret),
+		PaymentId(payment_hash.0)
+	).unwrap();
+	check_added_monitors!(nodes[0], 1);
+	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
+	assert_eq!(events.len(), 1);
+	let node_1_msgs = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
+	pass_along_path(&nodes[0], &[&nodes[1]], amt_msat, payment_hash, Some(payment_secret), node_1_msgs, true, None);
+	claim_payment_along_route(
+		ClaimAlongRouteArgs::new(&nodes[0], &[&[&nodes[1]]], payment_preimage)
+	);
+}