Return non-Optional Transaction from received_tx_signatures

We did not need to return `Option<Transaction>` as we actually don't
need to check if the counterparty had already sent their `tx_signatures`
before (in which case we'd return a `None` for `Option<Transaction>`).
Therefore, we just return a plain `Transaction` in the tuple here.

Further, we can get rid of the clone of `funding_tx` in
`Channel::tx_signatures` when setting the `Context::funding_transaction`
as we don't actually need to propagate it through to
`ChannelManager::internal_tx_complete` as we can use
`ChannelContext::unbroadcasted_funding()` which clones the
`ChannelContext::funding_transaction` anyway.

Author: dunxen

lightning/src/ln/channel.rs

@@ -5693,7 +5693,7 @@ impl<SP: Deref> Channel<SP> where
 		}
 	}
 
-	pub fn tx_signatures<L: Deref>(&mut self, msg: &msgs::TxSignatures, logger: &L) -> Result<(Option<msgs::TxSignatures>, Option<Transaction>), ChannelError>
+	pub fn tx_signatures<L: Deref>(&mut self, msg: &msgs::TxSignatures, logger: &L) -> Result<Option<msgs::TxSignatures>, ChannelError>
 		where L::Target: Logger
 	{
 		if !matches!(self.context.channel_state, ChannelState::FundingNegotiated) {
@@ -5730,12 +5730,10 @@ impl<SP: Deref> Channel<SP> where
 				// for spending. Doesn't seem to be anything in rust-bitcoin.
 			}
 
-			let (tx_signatures_opt, funding_tx_opt) = signing_session.received_tx_signatures(msg.clone())
+			let (tx_signatures_opt, funding_tx) = signing_session.received_tx_signatures(msg.clone())
 				.map_err(|_| ChannelError::Warn("Witness count did not match contributed input count".to_string()))?;
-			if funding_tx_opt.is_some() {
-				self.context.channel_state = ChannelState::AwaitingChannelReady(AwaitingChannelReadyFlags::new());
-			}
-			self.context.funding_transaction = funding_tx_opt.clone();
+			self.context.channel_state = ChannelState::AwaitingChannelReady(AwaitingChannelReadyFlags::new());
+			self.context.funding_transaction = Some(funding_tx);
 
 			self.context.next_funding_txid = None;
 
@@ -5745,10 +5743,10 @@ impl<SP: Deref> Channel<SP> where
 			if tx_signatures_opt.is_some() && self.context.channel_state.is_monitor_update_in_progress() {
 				log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
 				self.context.monitor_pending_tx_signatures = tx_signatures_opt;
-				return Ok((None, None));
+				return Ok(None);
 			}
 
-			Ok((tx_signatures_opt, funding_tx_opt))
+			Ok(tx_signatures_opt)
 		} else {
 			Err(ChannelError::Close((
 				"Unexpected tx_signatures. No funding transaction awaiting signatures".to_string(),

lightning/src/ln/channelmanager.rs

@@ -8370,14 +8370,14 @@ where
 				match channel_phase {
 					ChannelPhase::Funded(chan) => {
 						let logger = WithChannelContext::from(&self.logger, &chan.context, None);
-						let (tx_signatures_opt, funding_tx_opt) = try_chan_phase_entry!(self, peer_state, chan.tx_signatures(msg, &&logger), chan_phase_entry);
+						let tx_signatures_opt = try_chan_phase_entry!(self, peer_state, chan.tx_signatures(msg, &&logger), chan_phase_entry);
 						if let Some(tx_signatures) = tx_signatures_opt {
 							peer_state.pending_msg_events.push(events::MessageSendEvent::SendTxSignatures {
 								node_id: *counterparty_node_id,
 								msg: tx_signatures,
 							});
 						}
-						if let Some(ref funding_tx) = funding_tx_opt {
+						if let Some(ref funding_tx) = chan.context.unbroadcasted_funding() {
 							self.tx_broadcaster.broadcast_transactions(&[funding_tx]);
 							{
 								let mut pending_events = self.pending_events.lock().unwrap();

lightning/src/ln/interactivetxs.rs

@@ -320,10 +320,7 @@ impl InteractiveTxSigningSession {
 	/// unsigned transaction.
 	pub fn received_tx_signatures(
 		&mut self, tx_signatures: TxSignatures,
-	) -> Result<(Option<TxSignatures>, Option<Transaction>), ()> {
-		if self.counterparty_sent_tx_signatures {
-			return Ok((None, None));
-		};
+	) -> Result<(Option<TxSignatures>, Transaction), ()> {
 		if self.remote_inputs_count() != tx_signatures.witnesses.len() {
 			return Err(());
 		}
@@ -336,13 +333,7 @@ impl InteractiveTxSigningSession {
 			None
 		};
 
-		let funding_tx = if self.holder_tx_signatures.is_some() {
-			Some(self.finalize_funding_tx())
-		} else {
-			None
-		};
-
-		Ok((holder_tx_signatures, funding_tx))
+		Ok((holder_tx_signatures, self.finalize_funding_tx()))
 	}
 
 	/// Provides the holder witnesses for the unsigned transaction.