f - debug_assert

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1382,13 +1382,12 @@ impl<SP: Deref> Channel<SP> where
 		L::Target: Logger
 	{
 		let phase = core::mem::replace(&mut self.phase, ChannelPhase::Undefined);
-		if let ChannelPhase::UnfundedOutboundV1(chan) = phase {
+		let result = if let ChannelPhase::UnfundedOutboundV1(chan) = phase {
 			let logger = WithChannelContext::from(logger, &chan.context, None);
 			match chan.funding_signed(msg, best_block, signer_provider, &&logger) {
 				Ok((chan, monitor)) => {
 					self.phase = ChannelPhase::Funded(chan);
-					let funded_chan = self.as_funded_mut().expect("Channel should be funded");
-					Ok((funded_chan, monitor))
+					Ok(monitor)
 				},
 				Err((chan, e)) => {
 					self.phase = ChannelPhase::UnfundedOutboundV1(chan);
@@ -1398,7 +1397,10 @@ impl<SP: Deref> Channel<SP> where
 		} else {
 			self.phase = phase;
 			Err(ChannelError::NotFound("Failed to find corresponding channel".to_owned()))
-		}
+		};
+
+		debug_assert!(!matches!(self.phase, ChannelPhase::Undefined));
+		result.map(|monitor| (self.as_funded_mut().expect("Channel should be funded"), monitor))
 	}
 }