f make signing session fields private

Author: dunxen

lightning/src/ln/channel.rs

@@ -1980,7 +1980,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 
 		let mut output_index = None;
 		let expected_spk = self.context.get_funding_redeemscript().to_p2wsh();
-		for (idx, outp) in signing_session.unsigned_tx.outputs().enumerate() {
+		for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 			if outp.script_pubkey() == &expected_spk && outp.value() == self.context.get_value_satoshis() {
 				if output_index.is_some() {
 					return Err(ChannelError::Close(
@@ -1993,7 +1993,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 			}
 		}
 		let outpoint = if let Some(output_index) = output_index {
-			OutPoint { txid: signing_session.unsigned_tx.compute_txid(), index: output_index }
+			OutPoint { txid: signing_session.unsigned_tx().compute_txid(), index: output_index }
 		} else {
 			return Err(ChannelError::Close(
 				(
@@ -2008,7 +2008,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 		let commitment_signed = self.context.get_initial_commitment_signed(logger);
 		let commitment_signed = match commitment_signed {
 			Ok(commitment_signed) => {
-				self.context.funding_transaction = Some(signing_session.unsigned_tx.build_unsigned_tx());
+				self.context.funding_transaction = Some(signing_session.unsigned_tx().build_unsigned_tx());
 				commitment_signed
 			},
 			Err(err) => {
@@ -5902,7 +5902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		}
 
 		if let Some(ref mut signing_session) = self.interactive_tx_signing_session {
-			if msg.tx_hash != signing_session.unsigned_tx.compute_txid() {
+			if msg.tx_hash != signing_session.unsigned_tx().compute_txid() {
 				return Err(ChannelError::Close(
 					(
 						"The txid for the transaction does not match".to_string(),
@@ -6658,9 +6658,9 @@ impl<SP: Deref> FundedChannel<SP> where
 			let (commitment_update, tx_signatures, tx_abort) = if let Some(next_funding_txid) = msg.next_funding_txid {
 				 if let Some(session) = &self.interactive_tx_signing_session {
 					// if next_funding_txid matches the latest interactive funding transaction:
-					if session.unsigned_tx.compute_txid() == next_funding_txid {
+					if session.unsigned_tx().compute_txid() == next_funding_txid {
 						// if it has not received tx_signatures for that funding transaction:
-						if !session.counterparty_sent_tx_signatures {
+						if !session.counterparty_sent_tx_signatures() {
 							// if next_commitment_number is zero:
 							let commitment_update = if msg.next_local_commitment_number == 0 {
 								// MUST retransmit its commitment_signed for that funding transaction.
@@ -6675,16 +6675,16 @@ impl<SP: Deref> FundedChannel<SP> where
 								})
 							} else { None };
 							// if it has already received commitment_signed and it should sign first, as specified in the tx_signatures requirements:
-							if session.received_commitment_signed && session.holder_sends_tx_signatures_first {
+							if session.has_received_commitment_signed() && session.holder_sends_tx_signatures_first() {
 								// MUST send its tx_signatures for that funding transaction.
-								(commitment_update, session.holder_tx_signatures.clone(), None)
+								(commitment_update, session.holder_tx_signatures().clone(), None)
 							} else {
 								(commitment_update, None, None)
 							}
 						} else {
 							// if it has already received tx_signatures for that funding transaction:
 							// MUST send its tx_signatures for that funding transaction.
-							(None, session.holder_tx_signatures.clone(), None)
+							(None, session.holder_tx_signatures().clone(), None)
 						}
 					} else {
 						// MUST send tx_abort to let the sending node know that they can forget this funding transaction.
@@ -8030,7 +8030,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		// to the txid of that interactive transaction, else we MUST NOT set it.
 		if let Some(signing_session) = &self.interactive_tx_signing_session {
 			// Since we have a signing_session, this implies we've sent an initial `commitment_signed`...
-			if !signing_session.counterparty_sent_tx_signatures {
+			if !signing_session.counterparty_sent_tx_signatures() {
 				// ...but we didn't receive a `tx_signatures` from the counterparty yet.
 				Some(self.funding_outpoint().txid)
 			} else {

lightning/src/ln/interactivetxs.rs

@@ -289,16 +289,36 @@ impl ConstructedTransaction {
 /// https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#sharing-funding-signatures-tx_signatures
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct InteractiveTxSigningSession {
-	pub unsigned_tx: ConstructedTransaction,
-	pub counterparty_sent_tx_signatures: bool,
-	pub holder_sends_tx_signatures_first: bool,
-	pub received_commitment_signed: bool,
-	pub holder_tx_signatures: Option<TxSignatures>,
+	unsigned_tx: ConstructedTransaction,
+	counterparty_sent_tx_signatures: bool,
+	holder_sends_tx_signatures_first: bool,
+	has_received_commitment_signed: bool,
+	holder_tx_signatures: Option<TxSignatures>,
 }
 
 impl InteractiveTxSigningSession {
+	pub fn unsigned_tx(&self) -> &ConstructedTransaction {
+		&self.unsigned_tx
+	}
+
+	pub fn counterparty_sent_tx_signatures(&self) -> bool {
+		self.counterparty_sent_tx_signatures
+	}
+
+	pub fn holder_sends_tx_signatures_first(&self) -> bool {
+		self.holder_sends_tx_signatures_first
+	}
+
+	pub fn has_received_commitment_signed(&self) -> bool {
+		self.has_received_commitment_signed
+	}
+
+	pub fn holder_tx_signatures(&self) -> &Option<TxSignatures> {
+		&self.holder_tx_signatures
+	}
+
 	pub fn received_commitment_signed(&mut self) -> Option<TxSignatures> {
-		self.received_commitment_signed = true;
+		self.has_received_commitment_signed = true;
 		if self.holder_sends_tx_signatures_first {
 			self.holder_tx_signatures.clone()
 		} else {
@@ -307,7 +327,7 @@ impl InteractiveTxSigningSession {
 	}
 
 	pub fn get_tx_signatures(&self) -> Option<TxSignatures> {
-		if self.received_commitment_signed {
+		if self.has_received_commitment_signed {
 			self.holder_tx_signatures.clone()
 		} else {
 			None
@@ -988,7 +1008,7 @@ macro_rules! define_state_transitions {
 				let signing_session = InteractiveTxSigningSession {
 					holder_sends_tx_signatures_first: tx.holder_sends_tx_signatures_first,
 					unsigned_tx: tx,
-					received_commitment_signed: false,
+					has_received_commitment_signed: false,
 					holder_tx_signatures: None,
 					counterparty_sent_tx_signatures: false,
 				};