f - unroll macros

Author: jkczyz

lightning/src/ln/channel.rs

@@ -60,7 +60,7 @@ use crate::sign::{EntropySource, ChannelSigner, SignerProvider, NodeSigner, Reci
 use crate::events::{ClosureReason, Event};
 use crate::events::bump_transaction::BASE_INPUT_WEIGHT;
 use crate::routing::gossip::NodeId;
-use crate::util::ser::{Readable, ReadableArgs, TransactionU16LenLimited, Writeable, Writer};
+use crate::util::ser::{Readable, ReadableArgs, RequiredWrapper, TransactionU16LenLimited, Writeable, Writer};
 use crate::util::logger::{Logger, Record, WithContext};
 use crate::util::errors::APIError;
 use crate::util::config::{UserConfig, ChannelConfig, LegacyChannelConfig, ChannelHandshakeConfig, ChannelHandshakeLimits, MaxDustHTLCExposure};
@@ -1661,29 +1661,66 @@ pub(super) struct FundingScope {
 	funding_transaction: Option<Transaction>,
 }
 
-#[cfg(not(any(test, fuzzing)))]
-impl_writeable_tlv_based!(FundingScope, {
-	(0, value_to_self_msat, required),
-	(1, counterparty_selected_channel_reserve_satoshis, option),
-	(2, holder_selected_channel_reserve_satoshis, required),
-	(3, holder_max_commitment_tx_output, required),
-	(4, counterparty_max_commitment_tx_output, required),
-	(5, channel_transaction_parameters, (required: ReadableArgs, None)),
-	(6, funding_transaction, option),
-});
+impl Writeable for FundingScope {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
+		#[cfg(any(test, fuzzing))]
+		self.next_local_commitment_tx_fee_info_cached.write(writer)?;
+		#[cfg(any(test, fuzzing))]
+		self.next_remote_commitment_tx_fee_info_cached.write(writer)?;
 
-#[cfg(any(test, fuzzing))]
-impl_writeable_tlv_based!(FundingScope, {
-	(0, value_to_self_msat, required),
-	(1, counterparty_selected_channel_reserve_satoshis, option),
-	(2, holder_selected_channel_reserve_satoshis, required),
-	(3, holder_max_commitment_tx_output, required),
-	(4, counterparty_max_commitment_tx_output, required),
-	(5, channel_transaction_parameters, (required: ReadableArgs, None)),
-	(6, funding_transaction, option),
-	(126, next_local_commitment_tx_fee_info_cached, required), // FIXME: This won't work
-	(127, next_remote_commitment_tx_fee_info_cached, required), // FIXME: This won't work
-});
+		write_tlv_fields!(writer, {
+			(0, self.value_to_self_msat, required),
+			(1, self.counterparty_selected_channel_reserve_satoshis, option),
+			(2, self.holder_selected_channel_reserve_satoshis, required),
+			(3, self.holder_max_commitment_tx_output, required),
+			(4, self.counterparty_max_commitment_tx_output, required),
+			(5, self.channel_transaction_parameters, (required: ReadableArgs, None)),
+			(6, self.funding_transaction, option),
+		});
+		Ok(())
+	}
+}
+
+impl Readable for FundingScope {
+	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
+		let mut value_to_self_msat = RequiredWrapper(None);
+		let mut counterparty_selected_channel_reserve_satoshis = None;
+		let mut holder_selected_channel_reserve_satoshis = RequiredWrapper(None);
+		let mut holder_max_commitment_tx_output = RequiredWrapper(None);
+		let mut counterparty_max_commitment_tx_output = RequiredWrapper(None);
+		let mut channel_transaction_parameters = RequiredWrapper(None);
+		let mut funding_transaction = None;
+
+		#[cfg(any(test, fuzzing))]
+		let next_local_commitment_tx_fee_info_cached = Readable::read(reader)?;
+		#[cfg(any(test, fuzzing))]
+		let next_remote_commitment_tx_fee_info_cached = Readable::read(reader)?;
+
+		read_tlv_fields!(reader, {
+			(0, value_to_self_msat, required),
+			(1, counterparty_selected_channel_reserve_satoshis, option),
+			(2, holder_selected_channel_reserve_satoshis, required),
+			(3, holder_max_commitment_tx_output, required),
+			(4, counterparty_max_commitment_tx_output, required),
+			(5, channel_transaction_parameters, (required: ReadableArgs, None)),
+			(6, funding_transaction, option),
+		});
+
+		Ok(Self {
+			value_to_self_msat: value_to_self_msat.0.unwrap(),
+			counterparty_selected_channel_reserve_satoshis,
+			holder_selected_channel_reserve_satoshis: holder_selected_channel_reserve_satoshis.0.unwrap(),
+			holder_max_commitment_tx_output: holder_max_commitment_tx_output.0.unwrap(),
+			counterparty_max_commitment_tx_output: counterparty_max_commitment_tx_output.0.unwrap(),
+			channel_transaction_parameters: channel_transaction_parameters.0.unwrap(),
+			funding_transaction,
+			#[cfg(any(test, fuzzing))]
+			next_local_commitment_tx_fee_info_cached,
+			#[cfg(any(test, fuzzing))]
+			next_remote_commitment_tx_fee_info_cached,
+		})
+	}
+}
 
 impl FundingScope {
 	pub fn get_value_satoshis(&self) -> u64 {
@@ -3547,7 +3584,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 				if let Some(info) = projected_commit_tx_info {
 					let total_pending_htlcs = self.pending_inbound_htlcs.len() + self.pending_outbound_htlcs.len()
 						+ self.holding_cell_htlc_updates.len();
-					if info.total_pending_htlcs == total_pending_htlcs
+					if info.total_pending_htlcs == total_pending_htlcs as u64
 						&& info.next_holder_htlc_id == self.next_holder_htlc_id
 						&& info.next_counterparty_htlc_id == self.next_counterparty_htlc_id
 						&& info.feerate == self.feerate_per_kw {
@@ -4367,7 +4404,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 				+ context.holding_cell_htlc_updates.len();
 			let commitment_tx_info = CommitmentTxInfoCached {
 				fee,
-				total_pending_htlcs,
+				total_pending_htlcs: total_pending_htlcs as u64,
 				next_holder_htlc_id: match htlc.origin {
 					HTLCInitiator::LocalOffered => context.next_holder_htlc_id + 1,
 					HTLCInitiator::RemoteOffered => context.next_holder_htlc_id,
@@ -4463,7 +4500,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			let total_pending_htlcs = context.pending_inbound_htlcs.len() + context.pending_outbound_htlcs.len();
 			let commitment_tx_info = CommitmentTxInfoCached {
 				fee,
-				total_pending_htlcs,
+				total_pending_htlcs: total_pending_htlcs as u64,
 				next_holder_htlc_id: match htlc.origin {
 					HTLCInitiator::LocalOffered => context.next_holder_htlc_id + 1,
 					HTLCInitiator::RemoteOffered => context.next_holder_htlc_id,
@@ -4930,12 +4967,21 @@ pub(super) struct FundedChannel<SP: Deref> where SP::Target: SignerProvider {
 #[cfg(any(test, fuzzing))]
 struct CommitmentTxInfoCached {
 	fee: u64,
-	total_pending_htlcs: usize,
+	total_pending_htlcs: u64,
 	next_holder_htlc_id: u64,
 	next_counterparty_htlc_id: u64,
 	feerate: u32,
 }
 
+#[cfg(any(test, fuzzing))]
+impl_writeable_tlv_based!(CommitmentTxInfoCached, {
+	(0, fee, required),
+	(1, total_pending_htlcs, required),
+	(2, next_holder_htlc_id, required),
+	(3, next_counterparty_htlc_id, required),
+	(4, feerate, required),
+});
+
 /// Partial data from ChannelMonitorUpdateStep::LatestHolderCommitmentTXInfo used to simplify the
 /// return type of `ChannelContext::validate_commitment_signed`.
 struct LatestHolderCommitmentTXInfo {
@@ -8796,7 +8842,7 @@ impl<SP: Deref> FundedChannel<SP> where
 				*self.funding.next_local_commitment_tx_fee_info_cached.lock().unwrap() = None;
 				if let Some(info) = projected_commit_tx_info {
 					let total_pending_htlcs = self.context.pending_inbound_htlcs.len() + self.context.pending_outbound_htlcs.len();
-					if info.total_pending_htlcs == total_pending_htlcs
+					if info.total_pending_htlcs == total_pending_htlcs as u64
 						&& info.next_holder_htlc_id == self.context.next_holder_htlc_id
 						&& info.next_counterparty_htlc_id == self.context.next_counterparty_htlc_id
 						&& info.feerate == self.context.feerate_per_kw {