f - s/ready_to_sign/negotiation_complete

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -9705,7 +9705,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		let peer_state = &mut *peer_state_lock;
 		match peer_state.channel_by_id.entry(msg.channel_id) {
 			hash_map::Entry::Occupied(mut chan_entry) => {
-				let (msg_send_event_opt, ready_to_sign) = match chan_entry.get_mut().interactive_tx_constructor_mut() {
+				let (msg_send_event_opt, negotiation_complete) = match chan_entry.get_mut().interactive_tx_constructor_mut() {
 					Some(interactive_tx_constructor) => {
 						HandleTxCompleteResult(
 							interactive_tx_constructor
@@ -9722,7 +9722,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				if let Some(msg_send_event) = msg_send_event_opt {
 					peer_state.pending_msg_events.push(msg_send_event);
 				};
-				if ready_to_sign {
+				if negotiation_complete {
 					let (commitment_signed, funding_ready_for_sig_event_opt) = chan_entry
 						.get_mut()
 						.funding_tx_constructed(&self.logger)

lightning/src/ln/interactivetxs.rs

@@ -1616,8 +1616,8 @@ impl HandleTxCompleteValue {
 			HandleTxCompleteValue::SendTxMessage(msg) => {
 				(Some(msg.into_msg_send_event(counterparty_node_id)), false)
 			},
-			HandleTxCompleteValue::SendTxComplete(msg, ready_to_sign) => {
-				(Some(msg.into_msg_send_event(counterparty_node_id)), ready_to_sign)
+			HandleTxCompleteValue::SendTxComplete(msg, negotiation_complete) => {
+				(Some(msg.into_msg_send_event(counterparty_node_id)), negotiation_complete)
 			},
 			HandleTxCompleteValue::NegotiationComplete => (None, true),
 		}
@@ -2152,9 +2152,10 @@ mod tests {
 							HandleTxCompleteValue::SendTxMessage(msg_send) => {
 								(Some(msg_send), false)
 							},
-							HandleTxCompleteValue::SendTxComplete(msg_send, ready_to_sign) => {
-								(Some(msg_send), ready_to_sign)
-							},
+							HandleTxCompleteValue::SendTxComplete(
+								msg_send,
+								negotiation_complete,
+							) => (Some(msg_send), negotiation_complete),
 							HandleTxCompleteValue::NegotiationComplete => (None, true),
 						})
 					},
@@ -2168,9 +2169,9 @@ mod tests {
 		while constructor_a.is_some() || constructor_b.is_some() {
 			if let Some(message_send_a) = message_send_a.take() {
 				match handle_message_send(message_send_a, constructor_b.as_mut().unwrap()) {
-					Ok((msg_send, ready_to_sign)) => {
+					Ok((msg_send, negotiation_complete)) => {
 						message_send_b = msg_send;
-						if ready_to_sign {
+						if negotiation_complete {
 							final_tx_b = Some(
 								constructor_b
 									.take()
@@ -2201,9 +2202,9 @@ mod tests {
 			}
 			if let Some(message_send_b) = message_send_b.take() {
 				match handle_message_send(message_send_b, constructor_a.as_mut().unwrap()) {
-					Ok((msg_send, ready_to_sign)) => {
+					Ok((msg_send, negotiation_complete)) => {
 						message_send_a = msg_send;
-						if ready_to_sign {
+						if negotiation_complete {
 							final_tx_a = Some(
 								constructor_a
 									.take()