f update docs some to fix old mentions and clarify to not broadcast

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -2781,14 +2781,14 @@ impl<Signer: Sign> Channel<Signer> {
 			self.funding_transaction.take()
 		} else { None };
 
-		// Because we will never generate a FundingBroadcastSafe event when we're in
-		// MonitorUpdateFailed, if we assume the user only broadcast the funding transaction when
-		// they received the FundingBroadcastSafe event, we can only ever hit
+		// Because we will never broadcast the funding transaction when we're in
+		// MonitorUpdateFailed, if we assume the user never directly broadcasts the funding
+		// transaction and waits for us to do it, we can only ever hit
 		// monitor_pending_funding_locked when we're an inbound channel which failed to persist the
 		// monitor on funding_created, and we even got the funding transaction confirmed before the
 		// monitor was persisted.
 		let funding_locked = if self.monitor_pending_funding_locked {
-			assert!(!self.is_outbound(), "Funding transaction broadcast without FundingBroadcastSafe!");
+			assert!(!self.is_outbound(), "Funding transaction broadcast manually - we didn't do it!");
 			self.monitor_pending_funding_locked = false;
 			let next_per_commitment_point = self.holder_signer.get_per_commitment_point(self.cur_holder_commitment_transaction_number, &self.secp_ctx);
 			Some(msgs::FundingLocked {

lightning/src/ln/channelmanager.rs

@@ -851,10 +851,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 
 	/// Creates a new outbound channel to the given remote node and with the given value.
 	///
-	/// user_id will be provided back as user_channel_id in FundingGenerationReady and
-	/// FundingBroadcastSafe events to allow tracking of which events correspond with which
-	/// create_channel call. Note that user_channel_id defaults to 0 for inbound channels, so you
-	/// may wish to avoid using 0 for user_id here.
+	/// user_id will be provided back as user_channel_id in FundingGenerationReady events to allow
+	/// tracking of which events correspond with which create_channel call. Note that the
+	/// user_channel_id defaults to 0 for inbound channels, so you may wish to avoid using 0 for
+	/// user_id here.
 	///
 	/// If successful, will generate a SendOpenChannel message event, so you should probably poll
 	/// PeerManager::process_events afterwards.
@@ -1536,6 +1536,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	///
 	/// May panic if the funding_txo is duplicative with some other channel (note that this should
 	/// be trivially prevented by using unique funding transaction keys per-channel).
+	///
+	/// Do NOT broadcast the funding transaction yourself. When we have safely received our
+	/// counterparty's signature the funding transaction will automatically be broadcast via the
+	/// [`BroadcasterInterface`] provided when this `ChannelManager` was constructed.
 	pub fn funding_transaction_generated(&self, temporary_channel_id: &[u8; 32], funding_transaction: Transaction, output_index: u16) -> Result<(), APIError> {
 		let _persistence_guard = PersistenceNotifierGuard::new(&self.total_consistency_lock, &self.persistence_notifier);