f remove VariableLengthOnionPacket

Author: arik-so

lightning/src/ln/msgs.rs

@@ -1690,7 +1690,6 @@ mod fuzzy_internal_msgs {
 	use crate::ln::{PaymentPreimage, PaymentSecret};
 	use crate::ln::features::BlindedHopFeatures;
 	use super::FinalOnionHopData;
-    use crate::ln::msgs::VariableLengthOnionPacket;
 
 	// These types aren't intended to be pub, but are exposed for direct fuzzing (as we deserialize
 	// them from untrusted input):
@@ -1741,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<VariableLengthOnionPacket>
+            trampoline_packet: Option<crate::onion_message::Packet>
 		},
 		BlindedForward {
 			encrypted_tlvs: Vec<u8>,
@@ -1802,29 +1801,6 @@ impl fmt::Debug for OnionPacket {
 	}
 }
 
-/// BOLT 4 onion packet including hop data for the next peer.
-#[derive(Clone, Hash, PartialEq, Eq)]
-pub struct VariableLengthOnionPacket {
-	/// BOLT 4 version number.
-	pub version: u8,
-	/// In order to ensure we always return an error on onion decode in compliance with [BOLT
-	/// #4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md), we have to
-	/// deserialize `OnionPacket`s contained in [`UpdateAddHTLC`] messages even if the ephemeral
-	/// public key (here) is bogus, so we hold a [`Result`] instead of a [`PublicKey`] as we'd
-	/// like.
-	pub public_key: Result<PublicKey, secp256k1::Error>,
-	/// Variable number of bytes encrypted payload for the next hop; 650 by default for Trampoline
-	pub(crate) hop_data: Vec<u8>,
-	/// HMAC to verify the integrity of hop_data.
-	pub hmac: [u8; 32],
-}
-
-impl fmt::Debug for VariableLengthOnionPacket {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.write_fmt(format_args!("VariableLengthOnionPacket version {} with hmac {:?}", self.version, &self.hmac[..]))
-	}
-}
-
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub(crate) struct OnionErrorPacket {
 	// This really should be a constant size slice, but the spec lets these things be up to 128KB?
@@ -2253,23 +2229,6 @@ impl Readable for OnionPacket {
 	}
 }
 
-// This will be written as the value of a TLV, so when reading, the length of the hop data will be
-// inferred from a ReadableArg containing the total length. The standard hop data for Trampoline
-// onions will prospectively be 650 bytes.
-impl Writeable for VariableLengthOnionPacket {
-	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		self.version.write(w)?;
-		match self.public_key {
-			Ok(pubkey) => pubkey.write(w)?,
-			Err(_) => [0u8;33].write(w)?,
-		}
-		// don't encode the length of hop_data
-		w.write_all(&self.hop_data)?;
-		&self.hmac.write(w)?;
-		Ok(())
-	}
-}
-
 impl_writeable_msg!(UpdateAddHTLC, {
 	channel_id,
 	htlc_id,
@@ -2900,7 +2859,7 @@ mod tests {
 	use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 	use crate::ln::ChannelId;
 	use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
-	use crate::ln::msgs::{self, FinalOnionHopData, OnionErrorPacket, VariableLengthOnionPacket};
+	use crate::ln::msgs::{self, FinalOnionHopData, OnionErrorPacket};
 	use crate::ln::msgs::SocketAddress;
 	use crate::routing::gossip::{NodeAlias, NodeId};
 	use crate::util::ser::{Writeable, Readable, ReadableArgs, Hostname, TransactionU16LenLimited, BigSize};
@@ -2927,6 +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;
 
 	#[test]
 	fn encoding_channel_reestablish() {
@@ -4201,9 +4161,9 @@ mod tests {
 		let compressed_public_key = public_key.serialize();
 		assert_eq!(compressed_public_key.len(), 33);
 
-		let trampoline_packet = VariableLengthOnionPacket {
+		let trampoline_packet = Packet {
 			version: 0,
-			public_key: Ok(public_key),
+			public_key,
 			hop_data: vec![1; 650], // this should be the standard encoded length
 			hmac: [2; 32],
 		};
@@ -4243,9 +4203,9 @@ mod tests {
 		let compressed_public_key = public_key.serialize();
 		assert_eq!(compressed_public_key.len(), 33);
 
-		let trampoline_packet = VariableLengthOnionPacket {
+		let trampoline_packet = Packet {
 			version: 0,
-			public_key: Ok(public_key),
+			public_key,
 			hop_data,
 			hmac
 		};