f rename to quiescent_action + move to FundedChannel

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -1877,6 +1877,7 @@ where
 					holder_commitment_point,
 					#[cfg(splicing)]
 					pending_splice: None,
+					quiescent_action: None,
 				};
 				let res = funded_channel.initial_commitment_signed_v2(msg, best_block, signer_provider, logger)
 					.map(|monitor| (Some(monitor), None))
@@ -2751,12 +2752,6 @@ where
 	/// If we can't release a [`ChannelMonitorUpdate`] until some external action completes, we
 	/// store it here and only release it to the `ChannelManager` once it asks for it.
 	blocked_monitor_updates: Vec<PendingChannelMonitorUpdate>,
-
-	/// Once we become quiescent, if we're the initiator, there's some action we'll want to take.
-	/// This keeps track of that action. Note that if we become quiescent and we're not the
-	/// initiator we may be able to merge this action into what the counterparty wanted to do (e.g.
-	/// in the case of splicing).
-	post_quiescence_action: Option<QuiescentAction>,
 }
 
 /// A channel struct implementing this trait can receive an initial counterparty commitment
@@ -3331,8 +3326,6 @@ where
 			blocked_monitor_updates: Vec::new(),
 
 			is_manual_broadcast: false,
-
-			post_quiescence_action: None,
 		};
 
 		Ok((funding, channel_context))
@@ -3569,8 +3562,6 @@ where
 			blocked_monitor_updates: Vec::new(),
 			local_initiated_shutdown: None,
 			is_manual_broadcast: false,
-
-			post_quiescence_action: None,
 		};
 
 		Ok((funding, channel_context))
@@ -6103,6 +6094,12 @@ where
 	/// Info about an in-progress, pending splice (if any), on the pre-splice channel
 	#[cfg(splicing)]
 	pending_splice: Option<PendingSplice>,
+
+	/// Once we become quiescent, if we're the initiator, there's some action we'll want to take.
+	/// This keeps track of that action. Note that if we become quiescent and we're not the
+	/// initiator we may be able to merge this action into what the counterparty wanted to do (e.g.
+	/// in the case of splicing).
+	quiescent_action: Option<QuiescentAction>,
 }
 
 #[cfg(splicing)]
@@ -11579,11 +11576,11 @@ where
 				"Channel is not in a live state to propose quiescence".to_owned()
 			));
 		}
-		if self.context.post_quiescence_action.is_some() {
+		if self.quiescent_action.is_some() {
 			return Err(ChannelError::Ignore("Channel is already quiescing".to_owned()));
 		}
 
-		self.context.post_quiescence_action = Some(action);
+		self.quiescent_action = Some(action);
 		if self.context.channel_state.is_quiescent()
 			|| self.context.channel_state.is_awaiting_quiescence()
 			|| self.context.channel_state.is_local_stfu_sent()
@@ -11705,7 +11702,7 @@ where
 		);
 
 		if is_holder_quiescence_initiator {
-			match self.context.post_quiescence_action.take() {
+			match self.quiescent_action.take() {
 				None => {
 					debug_assert!(false);
 					return Err(ChannelError::WarnAndDisconnect(
@@ -12084,6 +12081,7 @@ where
 			holder_commitment_point,
 			#[cfg(splicing)]
 			pending_splice: None,
+			quiescent_action: None,
 		};
 
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
@@ -12370,6 +12368,7 @@ where
 			holder_commitment_point,
 			#[cfg(splicing)]
 			pending_splice: None,
+			quiescent_action: None,
 		};
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
 			|| channel.context.signer_pending_channel_ready;
@@ -14022,13 +14021,12 @@ where
 
 				blocked_monitor_updates: blocked_monitor_updates.unwrap(),
 				is_manual_broadcast: is_manual_broadcast.unwrap_or(false),
-
-				post_quiescence_action: None,
 			},
 			interactive_tx_signing_session,
 			holder_commitment_point,
 			#[cfg(splicing)]
 			pending_splice: None,
+			quiescent_action: None,
 		})
 	}
 }