f fix test now that metadatas are padded

Author: Matt Corallo

lightning/src/ln/max_payment_path_len_tests.rs

@@ -32,7 +32,7 @@ use crate::routing::router::{
 };
 use crate::sign::NodeSigner;
 use crate::types::features::BlindedHopFeatures;
-use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+use crate::types::payment::PaymentSecret;
 use crate::util::errors::APIError;
 use crate::util::ser::Writeable;
 use crate::util::test_utils;
@@ -80,26 +80,23 @@ fn large_payment_metadata() {
 		- final_payload_len_without_metadata;
 	let mut payment_metadata = vec![42; max_metadata_len];
 
-	let mut counter = 42;
 	macro_rules! get_payment_hash {
 		($node: expr, $metadata: expr) => {{
-			let payment_preimage = PaymentPreimage([counter; 32]);
-			#[allow(unused_assignments)]
-			{
-				counter += 1;
-			}
-			let payment_hash: PaymentHash = payment_preimage.into();
-			let (payment_secret, encrypted_metadata) = $node
+			let (payment_hash, payment_secret, encrypted_metadata) = $node
 				.node
-				.create_inbound_payment_for_hash(
+				.create_inbound_payment(Some(amt_msat), 7200, None, Some($metadata))
+				.unwrap();
+			let encrypted_metadata = encrypted_metadata.unwrap();
+			let mut metadata_for_preimage = encrypted_metadata.clone();
+			let payment_preimage = $node
+				.node
+				.get_payment_preimage_decrypt_metadata(
 					payment_hash,
-					Some(amt_msat),
-					7200,
-					None,
-					Some($metadata),
+					payment_secret,
+					Some(metadata_for_preimage.as_mut_slice()),
 				)
 				.unwrap();
-			(payment_hash, payment_preimage, payment_secret, encrypted_metadata.unwrap())
+			(payment_hash, payment_preimage, payment_secret, encrypted_metadata)
 		}};
 	}
 
@@ -126,6 +123,7 @@ fn large_payment_metadata() {
 	let args =
 		PassAlongPathArgs::new(&nodes[0], path, amt_msat, payment_hash, events.pop().unwrap())
 			.with_payment_secret(payment_secret)
+			.with_payment_preimage(payment_preimage)
 			.with_payment_metadata(payment_metadata.clone());
 	do_pass_along_path(args);
 	claim_payment_along_route(ClaimAlongRouteArgs::new(
@@ -219,6 +217,7 @@ fn large_payment_metadata() {
 	let args =
 		PassAlongPathArgs::new(&nodes[0], path, amt_msat, payment_hash_2, events.pop().unwrap())
 			.with_payment_secret(payment_secret_2)
+			.with_payment_preimage(payment_preimage_2)
 			.with_payment_metadata(two_hop_metadata);
 	do_pass_along_path(args);
 	claim_payment_along_route(ClaimAlongRouteArgs::new(