Simplify implementation of get_original_funding_txo

p2pderivatives · Nov 8, 2023 · 37a2e5f · 37a2e5f
1 parent ac13da6
commit 37a2e5f
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -1030,11 +1030,7 @@ impl<Signer: ChannelSigner> ChannelContext<Signer> {
 	/// Returns the funding txo which is always the one that was confirmed on chain, even if the
 	/// channel is split.
 	pub fn get_original_funding_txo(&self) -> Option<OutPoint> {
-		if self.channel_transaction_parameters.original_funding_outpoint.is_none() {
-			self.get_funding_txo()
-		} else {
-			self.channel_transaction_parameters.original_funding_outpoint
-		}
+		self.channel_transaction_parameters.original_funding_outpoint.or(self.get_funding_txo())
 	}
 
 	/// Set the funding output and value of the channel, returning a `ChannelMonitorUpdate`