X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fpackage.rs;h=b66a2f70d3369f4aff6e012025b3e995d6918a9e;hb=e99e6ab562af9b9a7e0f2d0dc1fee3dd09bb4082;hp=4576fde02153e2043f0316c509bafa82fa86cb10;hpb=6fd13d7b22c315d845f1df167719bc9869c02580;p=rust-lightning

diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs
index 4576fde0..b66a2f70 100644
--- a/lightning/src/chain/package.rs
+++ b/lightning/src/chain/package.rs
@@ -247,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, {
@@ -256,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),
 		});
 
@@ -321,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, {
@@ -329,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),
 		});
 
@@ -399,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),
 		});
 
@@ -429,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,
 }
 
@@ -460,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)
 		});