f: use trampoline cfg-gating

Author: arik-so

lightning/src/ln/msgs.rs

@@ -1811,7 +1811,7 @@ mod fuzzy_internal_msgs {
 		pub outgoing_cltv_value: u32,
 	}
 
-	#[allow(unused)]
+	#[cfg(trampoline)]
 	pub struct InboundTrampolineEntrypointPayload {
 		pub amt_to_forward: u64,
 		pub outgoing_cltv_value: u32,
@@ -1851,7 +1851,7 @@ mod fuzzy_internal_msgs {
 
 	pub enum InboundOnionPayload {
 		Forward(InboundOnionForwardPayload),
-		#[allow(unused)]
+		#[cfg(trampoline)]
 		TrampolineEntrypoint(InboundTrampolineEntrypointPayload),
 		Receive(InboundOnionReceivePayload),
 		BlindedForward(InboundOnionBlindedForwardPayload),
@@ -2943,6 +2943,7 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, NS)> for InboundOnionPayload wh
 		let mut payment_metadata: Option<WithoutLength<Vec<u8>>> = None;
 		let mut total_msat = None;
 		let mut keysend_preimage: Option<PaymentPreimage> = None;
+		#[cfg_attr(not(trampoline), allow(unused))]
 		let mut trampoline_onion_packet: Option<TrampolineOnionPacket> = None;
 		let mut invoice_request: Option<InvoiceRequest> = None;
 		let mut custom_tlvs = Vec::new();
@@ -2975,18 +2976,21 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, NS)> for InboundOnionPayload wh
 			return Err(DecodeError::InvalidValue)
 		}
 
+		#[cfg(trampoline)]
 		if let Some(trampoline_onion_packet) = trampoline_onion_packet {
 			if payment_metadata.is_some() || encrypted_tlvs_opt.is_some() ||
 				total_msat.is_some()
 			{ return Err(DecodeError::InvalidValue) }
-			Ok(Self::TrampolineEntrypoint(InboundTrampolineEntrypointPayload {
+			return Ok(Self::TrampolineEntrypoint(InboundTrampolineEntrypointPayload {
 				amt_to_forward: amt.ok_or(DecodeError::InvalidValue)?,
 				outgoing_cltv_value: cltv_value.ok_or(DecodeError::InvalidValue)?,
 				multipath_trampoline_data: payment_data,
 				trampoline_packet: trampoline_onion_packet,
-				current_path_key: intro_node_blinding_point
+				current_path_key: intro_node_blinding_point,
 			}))
-		} else if let Some(blinding_point) = intro_node_blinding_point.or(update_add_blinding_point) {
+		}
+
+		if let Some(blinding_point) = intro_node_blinding_point.or(update_add_blinding_point) {
 			if short_id.is_some() || payment_data.is_some() || payment_metadata.is_some() {
 				return Err(DecodeError::InvalidValue)
 			}