f rebase

lightning/src/ln/msgs.rs

@@ -1740,7 +1740,7 @@ mod fuzzy_internal_msgs {
 			custom_tlvs: Vec<(u64, Vec<u8>)>,
 			sender_intended_htlc_amt_msat: u64,
 			cltv_expiry_height: u32,
-            trampoline_packet: Option<crate::onion_message::Packet>
+            trampoline_packet: Option<crate::onion_message::packet::Packet>
 		},
 		BlindedForward {
 			encrypted_tlvs: Vec<u8>,
@@ -2886,7 +2886,7 @@ mod tests {
 	use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
 	#[cfg(feature = "std")]
 	use crate::ln::msgs::SocketAddressParseError;
-	use crate::onion_message::Packet;
+	use crate::onion_message::packet::Packet;
 
 	#[test]
 	fn encoding_channel_reestablish() {
@@ -4175,8 +4175,8 @@ mod tests {
 			payment_metadata: None,
 			keysend_preimage: None,
 			custom_tlvs: Vec::new(),
-			amt_msat: 0x0badf00d01020304,
-			outgoing_cltv_value: 0xffffffff,
+			sender_intended_htlc_amt_msat: 0x0badf00d01020304,
+			cltv_expiry_height: 0xffffffff,
 			trampoline_packet: Some(trampoline_packet)
 		};
 		let encoded_payload = msg.encode();