f variable length onion message packet

Author: valentinewallace

lightning/src/ln/onion_utils.rs

@@ -211,7 +211,7 @@ pub(super) fn construct_onion_packet(payloads: Vec<msgs::OnionHopData>, onion_ke
 /// Constructs the onion routing packet for onion messages.
 //  NOTE: this could prob be DRY'd with `construct_onion_packet`, but it'd lead to a large-ish diff,
 //  and it's a small method.
- pub(super) fn construct_onion_message_packet(payloads: Vec<onion_message::Payload>, onion_packet_keys: Vec<OnionKeys>, prng_seed: [u8; 32]) -> msgs::OnionPacket {
+ pub(super) fn construct_onion_message_packet(payloads: Vec<onion_message::Payload>, onion_packet_keys: Vec<OnionKeys>, prng_seed: [u8; 32]) -> onion_message::Packet {
 	 // calls:
 	 // * construct_onion_packet_with_init_noise
  }
@@ -228,8 +228,12 @@ pub(super) fn construct_onion_packet_bogus_hopdata<HD: Writeable>(payloads: Vec<
 	construct_onion_packet_with_init_noise(payloads, onion_keys, packet_data, associated_data)
 }
 
+enum Packet {
+	Payment(msgs::OnionPacket),
+	Message(onion_message::Packet),
+}
 /// panics if route_size_insane(paylods)
- fn construct_onion_packet_with_init_noise<HD: Writeable>(mut payloads: Vec<HD>, onion_keys: Vec<OnionKeys>, mut packet_data: [u8; ONION_DATA_LEN], associated_data: Option<&PaymentHash>) -> msgs::OnionPacket {
+ fn construct_onion_packet_with_init_noise<HD: Writeable>(mut payloads: Vec<HD>, onion_keys: Vec<OnionKeys>, mut packet_data: [u8; ONION_DATA_LEN], associated_data: Option<&PaymentHash>) -> Packet {
 	// calls `onion_messages::Payload::write`
 	let filler = {
 		const ONION_HOP_DATA_LEN: usize = 65; // We may decrease this eventually after TLV is common