-f move to impl_writeable*! macros

Author: Antoine Riard

lightning/src/chain/onchain_utils.rs

@@ -20,7 +20,7 @@ use bitcoin::hash_types::Txid;
 use bitcoin::secp256k1::key::{SecretKey,PublicKey};
 
 use ln::PaymentPreimage;
-use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment};
+use ln::chan_utils::{TxCreationKeys, HTLCOutputInCommitment, HTLC_OUTPUT_IN_COMMITMENT_SIZE};
 use ln::chan_utils;
 use ln::msgs::DecodeError;
 use chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
@@ -84,42 +84,19 @@ impl RevokedOutput {
 	}
 }
 
-impl Writeable for RevokedOutput {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.per_commitment_point.write(writer)?;
-		self.counterparty_delayed_payment_base_key.write(writer)?;
-		self.counterparty_htlc_base_key.write(writer)?;
-		writer.write_all(&self.per_commitment_key[..])?;
-		writer.write_all(&byte_utils::be64_to_array(self.weight))?;
-		writer.write_all(&byte_utils::be64_to_array(self.amount))?;
-		self.htlc.write(writer)?;
-		self.on_counterparty_tx_csv.write(writer)?;
-		Ok(())
-	}
-}
-
-impl Readable for RevokedOutput {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let per_commitment_point = Readable::read(reader)?;
-		let counterparty_delayed_payment_base_key = Readable::read(reader)?;
-		let counterparty_htlc_base_key = Readable::read(reader)?;
-		let per_commitment_key = Readable::read(reader)?;
-		let weight = Readable::read(reader)?;
-		let amount = Readable::read(reader)?;
-		let htlc = Readable::read(reader)?;
-		let on_counterparty_tx_csv = Readable::read(reader)?;
-		Ok(RevokedOutput {
-			per_commitment_point,
-			counterparty_delayed_payment_base_key,
-			counterparty_htlc_base_key,
-			per_commitment_key,
-			weight,
-			amount,
-			htlc,
-			on_counterparty_tx_csv
-		})
-	}
-}
+impl_writeable_len_match!(RevokedOutput, {
+		{ RevokedOutput { htlc: None, .. }, 33*3 + 32 + 8 + 8 + 1 + 2 },
+		{ _, 33*3 + 32 + 8 + 8 + 1 + HTLC_OUTPUT_IN_COMMITMENT_SIZE + 2 }
+	}, {
+	per_commitment_point,
+	counterparty_delayed_payment_base_key,
+	counterparty_htlc_base_key,
+	per_commitment_key,
+	weight,
+	amount,
+	htlc,
+	on_counterparty_tx_csv
+});
 
 /// A struct to describe a HTLC output on a counterparty commitment transaction.
 ///
@@ -148,46 +125,16 @@ impl CounterpartyHTLCOutput {
 	}
 }
 
-impl Writeable for CounterpartyHTLCOutput {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.per_commitment_point.write(writer)?;
-		self.counterparty_delayed_payment_base_key.write(writer)?;
-		self.counterparty_htlc_base_key.write(writer)?;
-		if let Some(preimage) = self.preimage {
-			writer.write_all(&[0; 1])?;
-			preimage.write(writer)?;
-		} else {
-			writer.write_all(&[1;1])?;
-		}
-		self.htlc.write(writer)?;
-		Ok(())
-	}
-}
-
-impl Readable for CounterpartyHTLCOutput {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let per_commitment_point = Readable::read(reader)?;
-		let counterparty_delayed_payment_base_key = Readable::read(reader)?;
-		let counterparty_htlc_base_key = Readable::read(reader)?;
-		let preimage = match <u8 as Readable>::read(reader)? {
-			0 => {
-				let preimage = Readable::read(reader)?;
-				Some(preimage)
-			},
-			1 => { None },
-			_ => return Err(DecodeError::InvalidValue),
-		};
-
-		let htlc = Readable::read(reader)?;
-		Ok(CounterpartyHTLCOutput {
-			per_commitment_point,
-			counterparty_delayed_payment_base_key,
-			counterparty_htlc_base_key,
-			preimage,
-			htlc
-		})
-	}
-}
+impl_writeable_len_match!(CounterpartyHTLCOutput, {
+		{ CounterpartyHTLCOutput { preimage: None, .. }, 33*3 + 1 + HTLC_OUTPUT_IN_COMMITMENT_SIZE },
+		{ _, 33*3 + 1 + 32 + HTLC_OUTPUT_IN_COMMITMENT_SIZE }
+	}, {
+	per_commitment_point,
+	counterparty_delayed_payment_base_key,
+	counterparty_htlc_base_key,
+	preimage,
+	htlc
+});
 
 /// A struct to describe a HTLC output on holder commitment transaction.
 ///
@@ -208,24 +155,13 @@ impl HolderHTLCOutput {
 	}
 }
 
-impl Writeable for HolderHTLCOutput {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.preimage.write(writer)?;
-		writer.write_all(&byte_utils::be64_to_array(self.amount))?;
-		Ok(())
-	}
-}
-
-impl Readable for HolderHTLCOutput {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		let preimage = Readable::read(reader)?;
-		let amount = Readable::read(reader)?;
-		Ok(HolderHTLCOutput {
-			preimage,
-			amount,
-		})
-	}
-}
+impl_writeable_len_match!(HolderHTLCOutput, {
+		{ HolderHTLCOutput { preimage: None, .. }, 1 + 8 },
+		{ _, 1 + 32 + 8 }
+	}, {
+	preimage,
+	amount
+});
 
 /// A struct to describe the channel output on the funding transaction.
 ///
@@ -243,20 +179,11 @@ impl HolderFundingOutput {
 	}
 }
 
-impl Writeable for HolderFundingOutput {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.funding_redeemscript.write(writer)?;
-		Ok(())
-	}
-}
-
-impl Readable for HolderFundingOutput {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		Ok(HolderFundingOutput {
-			funding_redeemscript: Readable::read(reader)?,
-		})
-	}
-}
+impl_writeable_len_match!(HolderFundingOutput, {
+	{ HolderFundingOutput { ref funding_redeemscript }, 2 + funding_redeemscript.len() }
+	}, {
+	funding_redeemscript
+});
 
 /// A wrapper encapsulating all in-protocol differing outputs categories.
 ///

lightning/src/ln/chan_utils.rs

@@ -40,7 +40,7 @@ use std::ops::Deref;
 use chain;
 
 // Maximum size of a serialized HTLCOutputInCommitment
-const HTLC_OUTPUT_IN_COMMITMENT_SIZE: usize = 1 + 8 + 4 + 32 + 5;
+pub(crate) const HTLC_OUTPUT_IN_COMMITMENT_SIZE: usize = 1 + 8 + 4 + 32 + 5;
 
 pub(crate) const MAX_HTLCS: u16 = 483;
 

lightning/src/util/ser_macros.rs

@@ -158,6 +158,7 @@ macro_rules! impl_writeable_len_match {
 					use util::ser::LengthCalculatingWriter;
 					let mut len_calc = LengthCalculatingWriter(0);
 					$( self.$field.write(&mut len_calc)?; )*
+					println!("len calc {} vs len {}", len_calc.0, len);
 					assert!(len_calc.0 $cmp len);
 				}
 				$( self.$field.write(w)?; )*