f rename

Author: valentinewallace

lightning/src/ln/functional_tests.rs

@@ -8039,7 +8039,7 @@ fn test_onion_value_mpp_set_calculation() {
 				RecipientOnionFields::secret_only(our_payment_secret), height + 1, &None).unwrap();
 			// Edit amt_to_forward to simulate the sender having set
 			// the final amount and the routing node taking less fee
-			if let msgs::OutboundPayload::Receive { ref mut amt_msat, .. } = onion_payloads[1] {
+			if let msgs::OutboundOnionPayload::Receive { ref mut amt_msat, .. } = onion_payloads[1] {
 				*amt_msat = 99_000;
 			} else { panic!() }
 			let new_onion_packet = onion_utils::construct_onion_packet(onion_payloads, onion_keys, [0; 32], &our_payment_hash).unwrap();

lightning/src/ln/msgs.rs

@@ -1442,7 +1442,7 @@ mod fuzzy_internal_msgs {
 		},
 	}
 
-	pub(crate) enum OutboundPayload {
+	pub(crate) enum OutboundOnionPayload {
 		Forward {
 			short_channel_id: u64,
 			amt_to_forward: u64,
@@ -1963,7 +1963,7 @@ impl Readable for FinalOnionHopData {
 	}
 }
 
-impl Writeable for OutboundPayload {
+impl Writeable for OutboundOnionPayload {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		match self {
 			Self::Forward { short_channel_id, amt_to_forward, outgoing_cltv_value } => {
@@ -3536,7 +3536,7 @@ mod tests {
 
 	#[test]
 	fn encoding_nonfinal_onion_hop_data() {
-		let outbound_msg = msgs::OutboundPayload::Forward {
+		let outbound_msg = msgs::OutboundOnionPayload::Forward {
 			short_channel_id: 0xdeadbeef1bad1dea,
 			amt_to_forward: 0x0badf00d01020304,
 			outgoing_cltv_value: 0xffffffff,
@@ -3555,7 +3555,7 @@ mod tests {
 
 	#[test]
 	fn encoding_final_onion_hop_data() {
-		let outbound_msg = msgs::OutboundPayload::Receive {
+		let outbound_msg = msgs::OutboundOnionPayload::Receive {
 			payment_data: None,
 			payment_metadata: None,
 			keysend_preimage: None,
@@ -3576,7 +3576,7 @@ mod tests {
 	#[test]
 	fn encoding_final_onion_hop_data_with_secret() {
 		let expected_payment_secret = PaymentSecret([0x42u8; 32]);
-		let outbound_msg = msgs::OutboundPayload::Receive {
+		let outbound_msg = msgs::OutboundOnionPayload::Receive {
 			payment_data: Some(FinalOnionHopData {
 				payment_secret: expected_payment_secret,
 				total_msat: 0x1badca1f
@@ -3758,14 +3758,14 @@ mod tests {
 	// see above test, needs to be a separate method for use of the serialization macros.
 	fn encode_big_payload() -> Result<Vec<u8>, io::Error> {
 		use crate::util::ser::HighZeroBytesDroppedBigSize;
-		let payload = msgs::OutboundPayload::Forward {
+		let payload = msgs::OutboundOnionPayload::Forward {
 			short_channel_id: 0xdeadbeef1bad1dea,
 			amt_to_forward: 1000,
 			outgoing_cltv_value: 0xffffffff,
 		};
 		let mut encoded_payload = Vec::new();
 		let test_bytes = vec![42u8; 1000];
-		if let msgs::OutboundPayload::Forward { short_channel_id, amt_to_forward, outgoing_cltv_value } = payload {
+		if let msgs::OutboundOnionPayload::Forward { short_channel_id, amt_to_forward, outgoing_cltv_value } = payload {
 			_encode_varint_length_prefixed_tlv!(&mut encoded_payload, {
 				(1, test_bytes, required_vec),
 				(2, HighZeroBytesDroppedBigSize(amt_to_forward), required),

lightning/src/ln/onion_route_tests.rs

@@ -252,7 +252,7 @@ struct BogusOnionHopData {
 	data: Vec<u8>
 }
 impl BogusOnionHopData {
-	fn new(orig: msgs::OutboundPayload) -> Self {
+	fn new(orig: msgs::OutboundOnionPayload) -> Self {
 		Self { data: orig.encode() }
 	}
 }
@@ -876,14 +876,14 @@ fn test_always_create_tlv_format_onion_payloads() {
 		&route.paths[0], 40000, RecipientOnionFields::spontaneous_empty(), cur_height, &None).unwrap();
 
 	match onion_payloads[0] {
-		msgs::OutboundPayload::Forward {..} => {},
+		msgs::OutboundOnionPayload::Forward {..} => {},
 		_ => { panic!(
 			"Should have generated a `msgs::OnionHopDataFormat::NonFinalNode` payload for `hops[0]`,
 			despite that the features signals no support for variable length onions"
 		)}
 	}
 	match onion_payloads[1] {
-		msgs::OutboundPayload::Receive {..} => {},
+		msgs::OutboundOnionPayload::Receive {..} => {},
 		_ => {panic!(
 			"Should have generated a `msgs::OnionHopDataFormat::FinalNode` payload for `hops[1]`,
 			despite that the features signals no support for variable length onions"

lightning/src/ln/onion_utils.rs

@@ -149,11 +149,11 @@ pub(super) fn construct_onion_keys<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T
 }
 
 /// returns the hop data, as well as the first-hop value_msat and CLTV value we should send.
-pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_onion: RecipientOnionFields, starting_htlc_offset: u32, keysend_preimage: &Option<PaymentPreimage>) -> Result<(Vec<msgs::OutboundPayload>, u64, u32), APIError> {
+pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_onion: RecipientOnionFields, starting_htlc_offset: u32, keysend_preimage: &Option<PaymentPreimage>) -> Result<(Vec<msgs::OutboundOnionPayload>, u64, u32), APIError> {
 	let mut cur_value_msat = 0u64;
 	let mut cur_cltv = starting_htlc_offset;
 	let mut last_short_channel_id = 0;
-	let mut res: Vec<msgs::OutboundPayload> = Vec::with_capacity(path.hops.len());
+	let mut res: Vec<msgs::OutboundOnionPayload> = Vec::with_capacity(path.hops.len());
 
 	for (idx, hop) in path.hops.iter().rev().enumerate() {
 		// First hop gets special values so that it can check, on receipt, that everything is
@@ -162,7 +162,7 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 		let value_msat = if cur_value_msat == 0 { hop.fee_msat } else { cur_value_msat };
 		let cltv = if cur_cltv == starting_htlc_offset { hop.cltv_expiry_delta + starting_htlc_offset } else { cur_cltv };
 		res.insert(0, if idx == 0 {
-			msgs::OutboundPayload::Receive {
+			msgs::OutboundOnionPayload::Receive {
 				payment_data: if let Some(secret) = recipient_onion.payment_secret.take() {
 					Some(msgs::FinalOnionHopData {
 						payment_secret: secret,
@@ -175,7 +175,7 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 				outgoing_cltv_value: cltv,
 			}
 		} else {
-			msgs::OutboundPayload::Forward {
+			msgs::OutboundOnionPayload::Forward {
 				short_channel_id: last_short_channel_id,
 				amt_to_forward: value_msat,
 				outgoing_cltv_value: cltv,
@@ -209,7 +209,7 @@ fn shift_slice_right(arr: &mut [u8], amt: usize) {
 }
 
 pub(super) fn construct_onion_packet(
-	payloads: Vec<msgs::OutboundPayload>, onion_keys: Vec<OnionKeys>, prng_seed: [u8; 32],
+	payloads: Vec<msgs::OutboundOnionPayload>, onion_keys: Vec<OnionKeys>, prng_seed: [u8; 32],
 	associated_data: &PaymentHash
 ) -> Result<msgs::OnionPacket, ()> {
 	let mut packet_data = [0; ONION_DATA_LEN];
@@ -991,7 +991,7 @@ mod tests {
 		// with raw hex instead of our in-memory enums, as the payloads contains custom types, and
 		// we have no way of representing that with our enums.
 		let payloads = vec!(
-			RawOnionHopData::new(msgs::OutboundPayload::Forward {
+			RawOnionHopData::new(msgs::OutboundOnionPayload::Forward {
 				short_channel_id: 1,
 				amt_to_forward: 15000,
 				outgoing_cltv_value: 1500,
@@ -1014,12 +1014,12 @@ mod tests {
 			RawOnionHopData {
 				data: hex::decode("52020236b00402057806080000000000000002fd02013c0102030405060708090a0b0c0d0e0f0102030405060708090a0b0c0d0e0f0102030405060708090a0b0c0d0e0f0102030405060708090a0b0c0d0e0f").unwrap(),
 			},
-			RawOnionHopData::new(msgs::OutboundPayload::Forward {
+			RawOnionHopData::new(msgs::OutboundOnionPayload::Forward {
 				short_channel_id: 3,
 				amt_to_forward: 12500,
 				outgoing_cltv_value: 1250,
 			}),
-			RawOnionHopData::new(msgs::OutboundPayload::Forward {
+			RawOnionHopData::new(msgs::OutboundOnionPayload::Forward {
 				short_channel_id: 4,
 				amt_to_forward: 10000,
 				outgoing_cltv_value: 1000,
@@ -1098,7 +1098,7 @@ mod tests {
 		data: Vec<u8>
 	}
 	impl RawOnionHopData {
-		fn new(orig: msgs::OutboundPayload) -> Self {
+		fn new(orig: msgs::OutboundOnionPayload) -> Self {
 			Self { data: orig.encode() }
 		}
 	}