f keep shutdown_msg name

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -409,7 +409,7 @@ pub(super) struct ReestablishResponses {
 	pub order: RAACommitmentOrder,
 	pub mon_update: Option<ChannelMonitorUpdate>,
 	pub holding_cell_failed_htlcs: Vec<(HTLCSource, PaymentHash)>,
-	pub shutdown: Option<msgs::Shutdown>,
+	pub shutdown_msg: Option<msgs::Shutdown>,
 }
 
 /// If the majority of the channels funds are to the fundee and the initiator holds only just
@@ -3548,7 +3548,7 @@ impl<Signer: Sign> Channel<Signer> {
 		// remaining cases either succeed or ErrorMessage-fail).
 		self.channel_state &= !(ChannelState::PeerDisconnected as u32);
 
-		let shutdown = if self.channel_state & (ChannelState::LocalShutdownSent as u32) != 0 {
+		let shutdown_msg = if self.channel_state & (ChannelState::LocalShutdownSent as u32) != 0 {
 			assert!(self.shutdown_scriptpubkey.is_some());
 			Some(msgs::Shutdown {
 				channel_id: self.channel_id,
@@ -3569,7 +3569,7 @@ impl<Signer: Sign> Channel<Signer> {
 					raa: None, commitment_update: None, mon_update: None,
 					order: RAACommitmentOrder::CommitmentFirst,
 					holding_cell_failed_htlcs: Vec::new(),
-					shutdown
+					shutdown_msg
 				});
 			}
 
@@ -3583,7 +3583,7 @@ impl<Signer: Sign> Channel<Signer> {
 				raa: None, commitment_update: None, mon_update: None,
 				order: RAACommitmentOrder::CommitmentFirst,
 				holding_cell_failed_htlcs: Vec::new(),
-				shutdown
+				shutdown_msg
 			});
 		}
 
@@ -3635,7 +3635,7 @@ impl<Signer: Sign> Channel<Signer> {
 						panic!("Got non-channel-failing result from free_holding_cell_htlcs"),
 					Ok((Some((commitment_update, monitor_update)), holding_cell_failed_htlcs)) => {
 						Ok(ReestablishResponses {
-							funding_locked, shutdown,
+							funding_locked, shutdown_msg,
 							raa: required_revoke,
 							commitment_update: Some(commitment_update),
 							order: self.resend_order.clone(),
@@ -3645,7 +3645,7 @@ impl<Signer: Sign> Channel<Signer> {
 					},
 					Ok((None, holding_cell_failed_htlcs)) => {
 						Ok(ReestablishResponses {
-							funding_locked, shutdown,
+							funding_locked, shutdown_msg,
 							raa: required_revoke,
 							commitment_update: None,
 							order: self.resend_order.clone(),
@@ -3656,7 +3656,7 @@ impl<Signer: Sign> Channel<Signer> {
 				}
 			} else {
 				Ok(ReestablishResponses {
-					funding_locked, shutdown,
+					funding_locked, shutdown_msg,
 					raa: required_revoke,
 					commitment_update: None,
 					order: self.resend_order.clone(),
@@ -3674,14 +3674,14 @@ impl<Signer: Sign> Channel<Signer> {
 			if self.channel_state & (ChannelState::MonitorUpdateFailed as u32) != 0 {
 				self.monitor_pending_commitment_signed = true;
 				Ok(ReestablishResponses {
-					funding_locked, shutdown,
+					funding_locked, shutdown_msg,
 					commitment_update: None, raa: None, mon_update: None,
 					order: self.resend_order.clone(),
 					holding_cell_failed_htlcs: Vec::new(),
 				})
 			} else {
 				Ok(ReestablishResponses {
-					funding_locked, shutdown,
+					funding_locked, shutdown_msg,
 					raa: required_revoke,
 					commitment_update: Some(self.get_last_commitment_update(logger)),
 					order: self.resend_order.clone(),

lightning/src/ln/channelmanager.rs

@@ -4724,7 +4724,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					// add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
 					let responses = try_chan_entry!(self, chan.get_mut().channel_reestablish(msg, &self.logger), channel_state, chan);
 					let mut channel_update = None;
-					if let Some(msg) = responses.shutdown {
+					if let Some(msg) = responses.shutdown_msg {
 						channel_state.pending_msg_events.push(events::MessageSendEvent::SendShutdown {
 							node_id: counterparty_node_id.clone(),
 							msg,