Change prevent-rebroadcast check to look at confirmed height; revert test

Author: optout21

lightning/src/ln/channel.rs

@@ -5489,10 +5489,18 @@ impl<SP: Deref> Channel<SP> where
 				// Take the funding transaction, do not clear the field
 				self.context.funding_transaction.clone()
 			} else { None };
-		// That said, if the funding transaction is already confirmed (ie we're active with a
-		// minimum_depth over 0) don't bother re-broadcasting the confirmed funding tx.
-		if matches!(self.context.channel_state, ChannelState::ChannelReady(_)) && self.context.minimum_depth != Some(0) {
-			funding_broadcastable = None;
+		// That said, if the funding transaction is already confirmed,
+		// don't bother re-broadcasting the confirmed funding tx.
+		if funding_broadcastable.is_some() {
+			if let Some(height) = self.context.get_funding_tx_confirmation_height() {
+				if let Some(block) = self.context.get_funding_tx_confirmed_in() {
+					log_debug!(logger,
+						"Not rebroadcasting funding tx, as it's already confirmed, height: {} block: {} txid: {}",
+						height, block, funding_broadcastable.unwrap().txid()
+					);
+					funding_broadcastable = None;
+				}
+			}
 		}
 
 		// We will never broadcast the funding transaction when we're in MonitorUpdateInProgress

lightning/src/ln/payment_tests.rs

@@ -891,7 +891,7 @@ fn do_test_completed_payment_not_retryable_on_reload(use_dust: bool) {
 	nodes[0].node.timer_tick_occurred();
 	assert!(nodes[0].node.list_channels().is_empty());
 	assert!(nodes[0].node.has_pending_payments());
-	assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0).len(), 4);
+	assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0).len(), 1);
 	check_added_monitors!(nodes[0], 1);
 
 	nodes[0].node.peer_connected(nodes[1].node.get_our_node_id(), &msgs::Init {