f use tlv stream

Author: dunxen

lightning/src/ln/interactivetxs.rs

@@ -450,36 +450,43 @@ impl InteractiveTxSigningSession {
 
 impl Writeable for InteractiveTxSigningSession {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
-		self.unsigned_tx.holder_is_initiator.write(writer)?;
-		self.unsigned_tx.holder_sends_tx_signatures_first.write(writer)?;
-		self.unsigned_tx
-			.inputs
-			.iter()
-			.map(|input| input.serial_id())
-			.collect::<Vec<_>>()
-			.write(writer)?;
-		self.unsigned_tx
-			.outputs
-			.iter()
-			.map(|output| output.serial_id)
-			.collect::<Vec<_>>()
-			.write(writer)?;
-		self.holder_tx_signatures.write(writer)?;
-		self.counterparty_sent_tx_signatures.write(writer)?;
-		self.has_received_commitment_signed.write(writer)?;
+		let input_serial_ids =
+			self.unsigned_tx.inputs.iter().map(|input| input.serial_id()).collect::<Vec<_>>();
+		let output_serial_ids =
+			self.unsigned_tx.outputs.iter().map(|output| output.serial_id).collect::<Vec<_>>();
+
+		write_tlv_fields!(writer, {
+			(0, self.unsigned_tx.holder_is_initiator, required),
+			(2, self.unsigned_tx.holder_sends_tx_signatures_first, required),
+			(4, input_serial_ids, required),
+			(6, output_serial_ids, required),
+			(8, self.holder_tx_signatures, required),
+			(10, self.counterparty_sent_tx_signatures, required),
+			(12, self.has_received_commitment_signed, required),
+		});
 		Ok(())
 	}
 }
 
 impl Readable for InteractiveTxSigningSession {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let holder_is_initiator: bool = Readable::read(reader)?;
-		let holder_sends_tx_signatures_first: bool = Readable::read(reader)?;
-		let inputs: Vec<SerialId> = Readable::read(reader)?;
-		let outputs: Vec<SerialId> = Readable::read(reader)?;
-		let holder_tx_signatures: Option<TxSignatures> = Readable::read(reader)?;
-		let counterparty_sent_tx_signatures: bool = Readable::read(reader)?;
-		let has_received_commitment_signed: bool = Readable::read(reader)?;
+		let mut holder_is_initiator = false;
+		let mut holder_sends_tx_signatures_first = false;
+		let mut input_serial_ids: Vec<SerialId> = vec![];
+		let mut output_serial_ids: Vec<SerialId> = vec![];
+		let mut holder_tx_signatures: Option<TxSignatures> = None;
+		let mut counterparty_sent_tx_signatures = false;
+		let mut has_received_commitment_signed = false;
+
+		read_tlv_fields!(reader, {
+			(0, holder_is_initiator, required),
+			(2, holder_sends_tx_signatures_first, required),
+			(4, input_serial_ids, required),
+			(6, output_serial_ids, required),
+			(8, holder_tx_signatures, required),
+			(10, counterparty_sent_tx_signatures, required),
+			(12, has_received_commitment_signed, required),
+		});
 
 		// We use an empty dummy `TxOut` for all `TxOut`s as they will be populated with their real
 		// values from `funding_transaction` after reading.
@@ -493,7 +500,7 @@ impl Readable for InteractiveTxSigningSession {
 			unsigned_tx: ConstructedTransaction {
 				holder_is_initiator,
 				holder_sends_tx_signatures_first,
-				inputs: inputs
+				inputs: input_serial_ids
 					.into_iter()
 					.map(|serial_id| {
 						if is_serial_id_valid_for_counterparty(holder_is_initiator, serial_id) {
@@ -514,7 +521,7 @@ impl Readable for InteractiveTxSigningSession {
 						}
 					})
 					.collect(),
-				outputs: outputs
+				outputs: output_serial_ids
 					.into_iter()
 					.map(|serial_id| {
 						let added_by = if is_serial_id_valid_for_counterparty(