Merge pull request #2548 from JosephGoulden/chain-monitor-logging

[rust-lightning] / lightning / src / chain / package.rs

diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs
index 891d7d1da33bddbeb8777c1349e1eda0a4c5a668..b66a2f70d3369f4aff6e012025b3e995d6918a9e 100644 (file)
--- a/lightning/src/chain/package.rs
+++ b/lightning/src/chain/package.rs
@@ -26,16 +26,13 @@ use crate::ln::chan_utils;
 use crate::ln::msgs::DecodeError;
 use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT};
 use crate::sign::WriteableEcdsaChannelSigner;
-#[cfg(anchors)]
-use crate::chain::onchaintx::ExternalHTLCClaim;
-use crate::chain::onchaintx::OnchainTxHandler;
+use crate::chain::onchaintx::{ExternalHTLCClaim, OnchainTxHandler};
 use crate::util::logger::Logger;
 use crate::util::ser::{Readable, Writer, Writeable, RequiredWrapper};
 
 use crate::io;
 use crate::prelude::*;
 use core::cmp;
-#[cfg(anchors)]
 use core::convert::TryInto;
 use core::mem;
 use core::ops::Deref;
@@ -250,7 +247,7 @@ impl Readable for CounterpartyOfferedHTLCOutput {
                let mut counterparty_htlc_base_key = RequiredWrapper(None);
                let mut preimage = RequiredWrapper(None);
                let mut htlc = RequiredWrapper(None);
-               let mut legacy_deserialization_prevention_marker: Option<()> = None;
+               let mut _legacy_deserialization_prevention_marker: Option<()> = None;
                let mut channel_type_features = None;
 
                read_tlv_fields!(reader, {
@@ -259,7 +256,7 @@ impl Readable for CounterpartyOfferedHTLCOutput {
                        (4, counterparty_htlc_base_key, required),
                        (6, preimage, required),
                        (8, htlc, required),
-                       (10, legacy_deserialization_prevention_marker, option),
+                       (10, _legacy_deserialization_prevention_marker, option),
                        (11, channel_type_features, option),
                });
 
@@ -324,7 +321,7 @@ impl Readable for CounterpartyReceivedHTLCOutput {
                let mut counterparty_delayed_payment_base_key = RequiredWrapper(None);
                let mut counterparty_htlc_base_key = RequiredWrapper(None);
                let mut htlc = RequiredWrapper(None);
-               let mut legacy_deserialization_prevention_marker: Option<()> = None;
+               let mut _legacy_deserialization_prevention_marker: Option<()> = None;
                let mut channel_type_features = None;
 
                read_tlv_fields!(reader, {
@@ -332,7 +329,7 @@ impl Readable for CounterpartyReceivedHTLCOutput {
                        (2, counterparty_delayed_payment_base_key, required),
                        (4, counterparty_htlc_base_key, required),
                        (6, htlc, required),
-                       (8, legacy_deserialization_prevention_marker, option),
+                       (8, _legacy_deserialization_prevention_marker, option),
                        (9, channel_type_features, option),
                });
 
@@ -402,14 +399,14 @@ impl Readable for HolderHTLCOutput {
                let mut amount_msat = RequiredWrapper(None);
                let mut cltv_expiry = RequiredWrapper(None);
                let mut preimage = None;
-               let mut legacy_deserialization_prevention_marker: Option<()> = None;
+               let mut _legacy_deserialization_prevention_marker: Option<()> = None;
                let mut channel_type_features = None;
 
                read_tlv_fields!(reader, {
                        (0, amount_msat, required),
                        (2, cltv_expiry, required),
                        (4, preimage, option),
-                       (6, legacy_deserialization_prevention_marker, option),
+                       (6, _legacy_deserialization_prevention_marker, option),
                        (7, channel_type_features, option),
                });
 
@@ -432,7 +429,7 @@ impl Readable for HolderHTLCOutput {
 #[derive(Clone, PartialEq, Eq)]
 pub(crate) struct HolderFundingOutput {
        funding_redeemscript: Script,
-       funding_amount: Option<u64>,
+       pub(crate) funding_amount: Option<u64>,
        channel_type_features: ChannelTypeFeatures,
 }
 
@@ -463,14 +460,14 @@ impl Writeable for HolderFundingOutput {
 impl Readable for HolderFundingOutput {
        fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
                let mut funding_redeemscript = RequiredWrapper(None);
-               let mut legacy_deserialization_prevention_marker: Option<()> = None;
+               let mut _legacy_deserialization_prevention_marker: Option<()> = None;
                let mut channel_type_features = None;
                let mut funding_amount = None;
 
                read_tlv_fields!(reader, {
                        (0, funding_redeemscript, required),
                        (1, channel_type_features, option),
-                       (2, legacy_deserialization_prevention_marker, option),
+                       (2, _legacy_deserialization_prevention_marker, option),
                        (3, funding_amount, option)
                });
 
@@ -866,7 +863,6 @@ impl PackageTemplate {
                let output_weight = (8 + 1 + destination_script.len()) * WITNESS_SCALE_FACTOR;
                inputs_weight + witnesses_weight + transaction_weight + output_weight
        }
-       #[cfg(anchors)]
        pub(crate) fn construct_malleable_package_with_external_funding<Signer: WriteableEcdsaChannelSigner>(
                &self, onchain_handler: &mut OnchainTxHandler<Signer>,
        ) -> Option<Vec<ExternalHTLCClaim>> {
@@ -971,7 +967,6 @@ impl PackageTemplate {
                None
        }
 
-       #[cfg(anchors)]
        /// Computes a feerate based on the given confirmation target. If a previous feerate was used,
        /// the new feerate is below it, and `force_feerate_bump` is set, we'll use a 25% increase of
        /// the previous feerate instead of the new feerate.