f: cfg-gate TrampolineForward

Author: arik-so

lightning/src/ln/channelmanager.rs

@@ -171,6 +171,7 @@ pub enum PendingHTLCRouting {
 		incoming_cltv_expiry: Option<u32>,
 	},
 	/// An HTLC which should be forwarded on to another Trampoline node.
+	#[cfg(trampoline)]
 	TrampolineForward {
 		/// The onion shared secret we build with the sender (or the preceding Trampoline node) used
 		/// to decrypt the onion.
@@ -288,6 +289,7 @@ impl PendingHTLCRouting {
 	fn blinded_failure(&self) -> Option<BlindedFailure> {
 		match self {
 			Self::Forward { blinded: Some(BlindedForward { failure, .. }), .. } => Some(*failure),
+			#[cfg(trampoline)]
 			Self::TrampolineForward { blinded: Some(BlindedForward { failure, .. }), .. } => Some(*failure),
 			Self::Receive { requires_blinded_error: true, .. } => Some(BlindedFailure::FromBlindedNode),
 			Self::ReceiveKeysend { requires_blinded_error: true, .. } => Some(BlindedFailure::FromBlindedNode),
@@ -298,6 +300,7 @@ impl PendingHTLCRouting {
 	fn incoming_cltv_expiry(&self) -> Option<u32> {
 		match self {
 			Self::Forward { incoming_cltv_expiry, .. } => *incoming_cltv_expiry,
+			#[cfg(trampoline)]
 			Self::TrampolineForward { incoming_cltv_expiry, .. } => Some(*incoming_cltv_expiry),
 			Self::Receive { incoming_cltv_expiry, .. } => Some(*incoming_cltv_expiry),
 			Self::ReceiveKeysend { incoming_cltv_expiry, .. } => Some(*incoming_cltv_expiry),
@@ -8929,6 +8932,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				for (forward_info, prev_htlc_id) in pending_forwards.drain(..) {
 					let scid = match forward_info.routing {
 						PendingHTLCRouting::Forward { short_channel_id, .. } => short_channel_id,
+						#[cfg(trampoline)]
 						PendingHTLCRouting::TrampolineForward { .. } => 0,
 						PendingHTLCRouting::Receive { .. } => 0,
 						PendingHTLCRouting::ReceiveKeysend { .. } => 0,
@@ -12470,6 +12474,36 @@ impl_writeable_tlv_based!(BlindedForward, {
 	(3, next_blinding_override, option),
 });
 
+#[cfg(not(trampoline))]
+impl_writeable_tlv_based_enum!(PendingHTLCRouting,
+	(0, Forward) => {
+		(0, onion_packet, required),
+		(1, blinded, option),
+		(2, short_channel_id, required),
+		(3, incoming_cltv_expiry, option),
+	},
+	(1, Receive) => {
+		(0, payment_data, required),
+		(1, phantom_shared_secret, option),
+		(2, incoming_cltv_expiry, required),
+		(3, payment_metadata, option),
+		(5, custom_tlvs, optional_vec),
+		(7, requires_blinded_error, (default_value, false)),
+		(9, payment_context, option),
+	},
+	(2, ReceiveKeysend) => {
+		(0, payment_preimage, required),
+		(1, requires_blinded_error, (default_value, false)),
+		(2, incoming_cltv_expiry, required),
+		(3, payment_metadata, option),
+		(4, payment_data, option), // Added in 0.0.116
+		(5, custom_tlvs, optional_vec),
+		(7, has_recipient_created_payment_secret, (default_value, false)),
+		(9, payment_context, option),
+		(11, invoice_request, option),
+	},
+);
+#[cfg(trampoline)]
 impl_writeable_tlv_based_enum!(PendingHTLCRouting,
 	(0, Forward) => {
 		(0, onion_packet, required),