Test sending and receiving of user_custom_data

Author: shaavan

lightning/src/ln/blinded_payment_tests.rs

@@ -1229,7 +1229,7 @@ fn conditionally_round_fwd_amt() {
 
 
 #[test]
-fn sender_custom_tlvs_to_blinded_path() {
+fn custom_tlvs_to_blinded_path() {
 	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]);
@@ -1245,7 +1245,7 @@ fn sender_custom_tlvs_to_blinded_path() {
 			htlc_minimum_msat: chan_upd.htlc_minimum_msat,
 		},
 		payment_context: PaymentContext::Bolt12Refund(Bolt12RefundContext {}),
-		custom_data: None,
+		custom_data: Some(vec![43, 43]),
 	};
 	let nonce = Nonce([42u8; 16]);
 	let expanded_key = chanmon_cfgs[1].keys_manager.get_inbound_payment_key();
@@ -1262,6 +1262,7 @@ fn sender_custom_tlvs_to_blinded_path() {
 	);
 
 	let recipient_onion_fields = RecipientOnionFields::spontaneous_empty()
+		.with_user_custom_data(vec![43, 43])
 		.with_sender_custom_tlvs(vec![((1 << 16) + 1, vec![42, 42])])
 		.unwrap();
 	nodes[0].node.send_payment(payment_hash, recipient_onion_fields.clone(),
@@ -1274,11 +1275,13 @@ fn sender_custom_tlvs_to_blinded_path() {
 
 	let path = &[&nodes[1]];
 	let args = PassAlongPathArgs::new(&nodes[0], path, amt_msat, payment_hash, ev)
+		.with_user_custom_data(recipient_onion_fields.user_custom_data.clone().unwrap())
 		.with_payment_secret(payment_secret)
 		.with_sender_custom_tlvs(recipient_onion_fields.sender_custom_tlvs.clone());
 	do_pass_along_path(args);
 	claim_payment_along_route(
 		ClaimAlongRouteArgs::new(&nodes[0], &[&[&nodes[1]]], payment_preimage)
+			.with_user_custom_data(recipient_onion_fields.user_custom_data.clone().unwrap())
 			.with_sender_custom_tlvs(recipient_onion_fields.sender_custom_tlvs.clone())
 	);
 }

lightning/src/ln/functional_test_utils.rs

@@ -2683,6 +2683,10 @@ impl<'a, 'b, 'c, 'd> PassAlongPathArgs<'a, 'b, 'c, 'd> {
 		self.expected_preimage = Some(payment_preimage);
 		self
 	}
+	pub fn with_user_custom_data(mut self, custom_tlvs: Vec<u8>) -> Self {
+		self.user_custom_data = Some(custom_tlvs);
+		self
+	}
 	pub fn with_sender_custom_tlvs(mut self, sender_custom_tlvs: Vec<(u64, Vec<u8>)>) -> Self {
 		self.sender_custom_tlvs = sender_custom_tlvs;
 		self

lightning/src/ln/payment_tests.rs

@@ -3746,7 +3746,7 @@ fn do_test_sender_custom_tlvs(spontaneous: bool, even_tlvs: bool, known_tlvs: bo
 }
 
 #[test]
-fn test_retry_sender_custom_tlvs() {
+fn test_retry_custom_tlvs() {
 	// Test that sender custom TLVs are successfully sent on retries
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
@@ -3769,7 +3769,6 @@ fn test_retry_sender_custom_tlvs() {
 
 	let sender_custom_tlvs = vec![((1 << 16) + 1, vec![0x42u8; 16])];
 	let onion_fields = RecipientOnionFields::secret_only(payment_secret);
-	let onion_fields = onion_fields.with_sender_custom_tlvs(sender_custom_tlvs.clone()).unwrap();
 
 	nodes[0].router.expect_find_route(route_params.clone(), Ok(route.clone()));
 	nodes[0].node.send_payment(payment_hash, onion_fields,