Use debug_assert & error on unexpected initial commitment_signed

dunxen · dunxen · commit 01760ab707e1 · 2024-11-28T11:53:39.000+02:00
This replaces the hard panic from this case.
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
@@ -4055,8 +4055,11 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	{
 		if !matches!(
 			self.channel_state, ChannelState::NegotiatingFunding(flags)
-			if flags == (NegotiatingFundingFlags::OUR_INIT_SENT | NegotiatingFundingFlags::THEIR_INIT_SENT)) {
-			panic!("Tried to get an initial commitment_signed messsage at a time other than immediately after initial handshake completion (or tried to get funding_created twice)");
+			if flags == (NegotiatingFundingFlags::OUR_INIT_SENT | NegotiatingFundingFlags::THEIR_INIT_SENT)
+		) {
+			debug_assert!(false);
+			return Err(ChannelError::Ignore("Tried to get an initial commitment_signed messsage at a time other than \
+				immediately after initial handshake completion (or tried to get funding_created twice)".to_string()));
 		}
 		self.assert_no_commitment_advancement("initial commitment_signed");
 

Original file line number	Diff line number	Diff line change
`@@ -4055,8 +4055,11 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {`
`4055`	`4055`	`{`
`4056`	`4056`	`if !matches!(`
`4057`	`4057`	`self.channel_state, ChannelState::NegotiatingFunding(flags)`
`4058`		`- if flags == (NegotiatingFundingFlags::OUR_INIT_SENT \| NegotiatingFundingFlags::THEIR_INIT_SENT)) {`
`4059`		`- panic!("Tried to get an initial commitment_signed messsage at a time other than immediately after initial handshake completion (or tried to get funding_created twice)");`
	`4058`	`+ if flags == (NegotiatingFundingFlags::OUR_INIT_SENT \| NegotiatingFundingFlags::THEIR_INIT_SENT)`
	`4059`	`+ ) {`
	`4060`	`+ debug_assert!(false);`
	`4061`	`+ return Err(ChannelError::Ignore("Tried to get an initial commitment_signed messsage at a time other than \`
	`4062`	`+ immediately after initial handshake completion (or tried to get funding_created twice)".to_string()));`
`4060`	`4063`	`}`
`4061`	`4064`	`self.assert_no_commitment_advancement("initial commitment_signed");`
`4062`	`4065`