Revert "Retransmit channel_ready / splice_locked awaiting announcement_sigs"

This reverts commit 48ddcc61975580579e056b9087ace28c5c887b61.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -8793,65 +8793,8 @@ where
 		let channel_ready = if msg.next_local_commitment_number == 1 && INITIAL_COMMITMENT_NUMBER - self.holder_commitment_point.transaction_number() == 1 {
 			// We should never have to worry about MonitorUpdateInProgress resending ChannelReady
 			self.get_channel_ready(logger)
-		} else if splicing_negotiated {
-			// A node:
-			//   - if `option_splice` was negotiated and `your_last_funding_locked` is not
-			//     set in the `channel_reestablish` it received:
-			//     - MUST retransmit `channel_ready`.
-			msg.your_last_funding_locked_txid
-				.is_none()
-				.then(|| ())
-				// The sending node:
-				//   - if `my_current_funding_locked` is included:
-				//     - if `announce_channel` is set for this channel:
-				//       - if it has not received `announcement_signatures` for that transaction:
-				//         - MUST retransmit `channel_ready` or `splice_locked` after exchanging `channel_reestablish`.
-				.or_else(|| {
-					self.maybe_get_my_current_funding_locked()
-						.filter(|funding| !funding.is_splice())
-						.filter(|_| self.context.config.announce_for_forwarding)
-						.filter(|_| self.context.announcement_sigs.is_none())
-						.map(|_| ())
-				})
-				.and_then(|_| self.get_channel_ready(logger))
 		} else { None };
 
-		let sent_splice_txid = self
-			.maybe_get_my_current_funding_locked()
-			.filter(|funding| funding.is_splice())
-			.map(|funding| {
-				funding.get_funding_txid().expect("Splice funding_txid should always be set")
-			});
-		let splice_locked = msg
-			// A receiving node:
-			//   - if `your_last_funding_locked` is set and it does not match the most recent
-			//     `splice_locked` it has sent:
-			//     - MUST retransmit `splice_locked`.
-			.your_last_funding_locked_txid
-			.and_then(|last_funding_txid| {
-				sent_splice_txid.filter(|sent_splice_txid| last_funding_txid != *sent_splice_txid)
-			})
-			// The sending node:
-			//   - if `my_current_funding_locked` is included:
-			//     - if `announce_channel` is set for this channel:
-			//       - if it has not received `announcement_signatures` for that transaction:
-			//         - MUST retransmit `channel_ready` or `splice_locked` after exchanging `channel_reestablish`.
-			.or_else(|| {
-				sent_splice_txid
-					.filter(|_| self.context.config.announce_for_forwarding)
-					.filter(|sent_splice_txid| {
-						if self.funding.get_funding_txid() == Some(*sent_splice_txid) {
-							self.context.announcement_sigs.is_none()
-						} else {
-							true
-						}
-					})
-			})
-			.map(|splice_txid| msgs::SpliceLocked {
-				channel_id: self.context.channel_id,
-				splice_txid,
-			});
-
 		let mut commitment_update = None;
 		let mut tx_signatures = None;
 		let mut tx_abort = None;