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

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index e533e532..dd553c1f 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(())
@@ -7516,7 +7516,7 @@ mod tests {
 		}
 	}
 
-	#[cfg(not(feature = "grind_signatures"))]
+	#[cfg(feature = "_test_vectors")]
 	#[test]
 	fn outbound_commitment_test() {
 		use bitcoin::util::sighash;
@@ -7549,6 +7549,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()[..],