f check_dummy_hopd_path_length instead of padding, as its about hops

Author: TheBlueMatt

lightning/src/ln/offers_tests.rs

@@ -163,7 +163,7 @@ fn check_compact_path_introduction_node<'a, 'b, 'c>(
 		&& matches!(path.introduction_node(), IntroductionNode::DirectedShortChannelId(..))
 }
 
-fn check_padded_path_length<'a, 'b, 'c>(
+fn check_dummy_hopd_path_length<'a, 'b, 'c>(
 	path: &BlindedMessagePath,
 	lookup_node: &Node<'a, 'b, 'c>,
 	expected_introduction_node: PublicKey,
@@ -491,7 +491,7 @@ fn check_dummy_hop_pattern_in_offer() {
 
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
-	assert!(check_padded_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
 
 	// Case 2: NodeIdMessageRouter → uses node ID-based blinded paths
 	// Expected: Also padded to QR_CODED_PADDED_PATH_LENGTH for QR code size optimization
@@ -513,7 +513,7 @@ fn check_dummy_hop_pattern_in_offer() {
 
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
-	assert!(check_padded_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
 }
 
 /// Checks that blinded paths are compact for short-lived offers.
@@ -698,7 +698,7 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 	});
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
-	assert!(check_padded_path_length(&reply_path, bob, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, bob, charlie_id, PADDED_PATH_LENGTH));
 
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(charlie_id).unwrap();
 	charlie.onion_messenger.handle_onion_message(alice_id, &onion_message);
@@ -717,8 +717,8 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 	// to Alice when she's handling the message. Therefore, either Bob or Charlie could
 	// serve as the introduction node for the reply path back to Alice.
 	assert!(
-		check_padded_path_length(&reply_path, david, bob_id, PADDED_PATH_LENGTH) ||
-		check_padded_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH)
+		check_dummy_hopd_path_length(&reply_path, david, bob_id, PADDED_PATH_LENGTH) ||
+		check_dummy_hopd_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH)
 	);
 
 	route_bolt12_payment(david, &[charlie, bob, alice], &invoice);
@@ -801,7 +801,7 @@ fn creates_and_pays_for_refund_using_two_hop_blinded_path() {
 	for path in invoice.payment_paths() {
 		assert_eq!(path.introduction_node(), &IntroductionNode::NodeId(bob_id));
 	}
-	assert!(check_padded_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
 
 	route_bolt12_payment(david, &[charlie, bob, alice], &invoice);
 	expect_recent_payment!(david, RecentPaymentDetails::Pending, payment_id);
@@ -856,7 +856,7 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 	});
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
-	assert!(check_padded_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
 
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
 	bob.onion_messenger.handle_onion_message(alice_id, &onion_message);
@@ -868,7 +868,7 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 	for path in invoice.payment_paths() {
 		assert_eq!(path.introduction_node(), &IntroductionNode::NodeId(alice_id));
 	}
-	assert!(check_padded_path_length(&reply_path, bob, alice_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, bob, alice_id, PADDED_PATH_LENGTH));
 
 	route_bolt12_payment(bob, &[alice], &invoice);
 	expect_recent_payment!(bob, RecentPaymentDetails::Pending, payment_id);
@@ -924,7 +924,7 @@ fn creates_and_pays_for_refund_using_one_hop_blinded_path() {
 	for path in invoice.payment_paths() {
 		assert_eq!(path.introduction_node(), &IntroductionNode::NodeId(alice_id));
 	}
-	assert!(check_padded_path_length(&reply_path, bob, alice_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, bob, alice_id, PADDED_PATH_LENGTH));
 
 	route_bolt12_payment(bob, &[alice], &invoice);
 	expect_recent_payment!(bob, RecentPaymentDetails::Pending, payment_id);
@@ -1101,7 +1101,7 @@ fn send_invoice_requests_with_distinct_reply_path() {
 	alice.onion_messenger.handle_onion_message(bob_id, &onion_message);
 
 	let (_, reply_path) = extract_invoice_request(alice, &onion_message);
-	assert!(check_padded_path_length(&reply_path, alice, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, charlie_id, PADDED_PATH_LENGTH));
 
 	// Send, extract and verify the second Invoice Request message
 	let onion_message = david.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
@@ -1111,7 +1111,7 @@ fn send_invoice_requests_with_distinct_reply_path() {
 	alice.onion_messenger.handle_onion_message(bob_id, &onion_message);
 
 	let (_, reply_path) = extract_invoice_request(alice, &onion_message);
-	assert!(check_padded_path_length(&reply_path, alice, frank_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, frank_id, PADDED_PATH_LENGTH));
 }
 
 /// This test checks that when multiple potential introduction nodes are available for the payee,
@@ -1182,7 +1182,7 @@ fn send_invoice_for_refund_with_distinct_reply_path() {
 	let onion_message = bob.onion_messenger.next_onion_message_for_peer(alice_id).unwrap();
 
 	let (_, reply_path) = extract_invoice(alice, &onion_message);
-	assert!(check_padded_path_length(&reply_path, alice, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, charlie_id, PADDED_PATH_LENGTH));
 
 	// Send, extract and verify the second Invoice Request message
 	let onion_message = david.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
@@ -1191,7 +1191,7 @@ fn send_invoice_for_refund_with_distinct_reply_path() {
 	let onion_message = bob.onion_messenger.next_onion_message_for_peer(alice_id).unwrap();
 
 	let (_, reply_path) = extract_invoice(alice, &onion_message);
-	assert!(check_padded_path_length(&reply_path, alice, nodes[6].node.get_our_node_id(), PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, nodes[6].node.get_our_node_id(), PADDED_PATH_LENGTH));
 }
 
 /// Verifies that the invoice request message can be retried if it fails to reach the
@@ -1245,7 +1245,7 @@ fn creates_and_pays_for_offer_with_retry() {
 	});
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
-	assert!(check_padded_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, alice, bob_id, PADDED_PATH_LENGTH));
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
 	bob.onion_messenger.handle_onion_message(alice_id, &onion_message);
 
@@ -1546,7 +1546,7 @@ fn fails_authentication_when_handling_invoice_request() {
 	let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
-	assert!(check_padded_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
 
 	assert_eq!(alice.onion_messenger.next_onion_message_for_peer(charlie_id), None);
 
@@ -1575,7 +1575,7 @@ fn fails_authentication_when_handling_invoice_request() {
 	let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
-	assert!(check_padded_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
 
 	assert_eq!(alice.onion_messenger.next_onion_message_for_peer(charlie_id), None);
 }
@@ -1675,7 +1675,7 @@ fn fails_authentication_when_handling_invoice_for_offer() {
 	let (invoice_request, reply_path) = extract_invoice_request(alice, &onion_message);
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), david_id);
-	assert!(check_padded_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
+	assert!(check_dummy_hopd_path_length(&reply_path, david, charlie_id, PADDED_PATH_LENGTH));
 
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(charlie_id).unwrap();
 	charlie.onion_messenger.handle_onion_message(alice_id, &onion_message);