X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=8b5e89d9441ace4510bddd65f877fc7355f94604;hb=ec3aa494953c7d720370119f673e8e6b3a2155d5;hp=e533e532f7e6d526c97fd11b2257e70dafa59c07;hpb=f65660945d7f3577e09e9860b82b52f9b33a5814;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index e533e532..8b5e89d9 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -312,9 +312,9 @@ pub(super) enum ChannelUpdateStatus {
 	/// We've announced the channel as enabled and are connected to our peer.
 	Enabled,
 	/// Our channel is no longer live, but we haven't announced the channel as disabled yet.
-	DisabledStaged,
+	DisabledStaged(u8),
 	/// Our channel is live again, but we haven't announced the channel as enabled yet.
-	EnabledStaged,
+	EnabledStaged(u8),
 	/// We've announced the channel as disabled.
 	Disabled,
 }
@@ -6193,8 +6193,8 @@ impl Writeable for ChannelUpdateStatus {
 		// channel as enabled, so we write 0. For EnabledStaged, we similarly write a 1.
 		match self {
 			ChannelUpdateStatus::Enabled => 0u8.write(writer)?,
-			ChannelUpdateStatus::DisabledStaged => 0u8.write(writer)?,
-			ChannelUpdateStatus::EnabledStaged => 1u8.write(writer)?,
+			ChannelUpdateStatus::DisabledStaged(_) => 0u8.write(writer)?,
+			ChannelUpdateStatus::EnabledStaged(_) => 1u8.write(writer)?,
 			ChannelUpdateStatus::Disabled => 1u8.write(writer)?,
 		}
 		Ok(())
@@ -7024,6 +7024,7 @@ mod tests {
 	use crate::chain::chaininterface::{FeeEstimator, LowerBoundedFeeEstimator, ConfirmationTarget};
 	use crate::chain::keysinterface::{ChannelSigner, InMemorySigner, EntropySource, SignerProvider};
 	use crate::chain::transaction::OutPoint;
+	use crate::routing::router::Path;
 	use crate::util::config::UserConfig;
 	use crate::util::enforcing_trait_impls::EnforcingSigner;
 	use crate::util::errors::APIError;
@@ -7201,7 +7202,7 @@ mod tests {
 			cltv_expiry: 200000000,
 			state: OutboundHTLCState::Committed,
 			source: HTLCSource::OutboundRoute {
-				path: Vec::new(),
+				path: Path { hops: Vec::new(), blinded_tail: None },
 				session_priv: SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
 				first_hop_htlc_msat: 548,
 				payment_id: PaymentId([42; 32]),
@@ -7516,7 +7517,7 @@ mod tests {
 		}
 	}
 
-	#[cfg(not(feature = "grind_signatures"))]
+	#[cfg(feature = "_test_vectors")]
 	#[test]
 	fn outbound_commitment_test() {
 		use bitcoin::util::sighash;
@@ -7549,6 +7550,7 @@ mod tests {
 			[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff],
 			10_000_000,
 			[0; 32],
+			[0; 32],
 		);
 
 		assert_eq!(signer.pubkeys().funding_pubkey.serialize()[..],