@@ -1672,10 +1672,8 @@ impl Writeable for FundingScope {
16721672 (0, self.value_to_self_msat, required),
16731673 (1, self.counterparty_selected_channel_reserve_satoshis, option),
16741674 (2, self.holder_selected_channel_reserve_satoshis, required),
1675- (3, self.holder_max_commitment_tx_output, required),
1676- (4, self.counterparty_max_commitment_tx_output, required),
1677- (5, self.channel_transaction_parameters, (required: ReadableArgs, None)),
1678- (6, self.funding_transaction, option),
1675+ (3, self.channel_transaction_parameters, (required: ReadableArgs, None)),
1676+ (4, self.funding_transaction, option),
16791677 });
16801678 Ok(())
16811679 }
@@ -1686,8 +1684,6 @@ impl Readable for FundingScope {
16861684 let mut value_to_self_msat = RequiredWrapper(None);
16871685 let mut counterparty_selected_channel_reserve_satoshis = None;
16881686 let mut holder_selected_channel_reserve_satoshis = RequiredWrapper(None);
1689- let mut holder_max_commitment_tx_output = RequiredWrapper(None);
1690- let mut counterparty_max_commitment_tx_output = RequiredWrapper(None);
16911687 let mut channel_transaction_parameters = RequiredWrapper(None);
16921688 let mut funding_transaction = None;
16931689
@@ -1700,18 +1696,18 @@ impl Readable for FundingScope {
17001696 (0, value_to_self_msat, required),
17011697 (1, counterparty_selected_channel_reserve_satoshis, option),
17021698 (2, holder_selected_channel_reserve_satoshis, required),
1703- (3, holder_max_commitment_tx_output, required),
1704- (4, counterparty_max_commitment_tx_output, required),
1705- (5, channel_transaction_parameters, (required: ReadableArgs, None)),
1706- (6, funding_transaction, option),
1699+ (3, channel_transaction_parameters, (required: ReadableArgs, None)),
1700+ (4, funding_transaction, option),
17071701 });
17081702
17091703 Ok(Self {
17101704 value_to_self_msat: value_to_self_msat.0.unwrap(),
17111705 counterparty_selected_channel_reserve_satoshis,
17121706 holder_selected_channel_reserve_satoshis: holder_selected_channel_reserve_satoshis.0.unwrap(),
1713- holder_max_commitment_tx_output: holder_max_commitment_tx_output.0.unwrap(),
1714- counterparty_max_commitment_tx_output: counterparty_max_commitment_tx_output.0.unwrap(),
1707+ #[cfg(debug_assertions)]
1708+ holder_max_commitment_tx_output: Mutex::new((0, 0)),
1709+ #[cfg(debug_assertions)]
1710+ counterparty_max_commitment_tx_output: Mutex::new((0, 0)),
17151711 channel_transaction_parameters: channel_transaction_parameters.0.unwrap(),
17161712 funding_transaction,
17171713 #[cfg(any(test, fuzzing))]
0 commit comments