fixup! Allow forwarding HTLCs that were constructed for previous config

Author: wpaulino

lightning/src/ln/channel.rs

@@ -4573,17 +4573,20 @@ impl<Signer: Sign> Channel<Signer> {
 	}
 
 	/// Determines whether the parameters of an incoming HTLC to be forwarded satisfy the channel's
-	/// [`ChannelConfig`]. This first looks at the channel's previous [`ChannelConfig`], if any, and
-	/// if unsuccessful, falls back to the current one.
+	/// [`ChannelConfig`]. This first looks at the channel's current [`ChannelConfig`], and if
+	/// unsuccessful, falls back to the previous one if one exists.
 	pub fn htlc_satisfies_config(
 		&self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
 	) -> Result<(), (&'static str, u16)> {
+		let res = self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.config());
+		if res.is_ok() {
+			return res;
+		}
 		if let Some(prev_config) = self.prev_config() {
-			if self.internal_htlc_satisfies_config(htlc, amt_to_forward, outgoing_cltv_value, &prev_config).is_ok() {
-				return Ok(());
-			}
+			self.internal_htlc_satisfies_config(htlc, amt_to_forward, outgoing_cltv_value, &prev_config)
+		} else {
+			res
 		}
-		self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.config())
 	}
 
 	pub fn get_feerate(&self) -> u32 {