f condense horror to map; condense signing state checks

Author: dunxen

lightning/src/ln/channel.rs

@@ -2106,10 +2106,7 @@ trait InitialRemoteCommitmentReceiver<SP: Deref> where SP::Target: SignerProvide
 		context.channel_id = channel_id;
 
 		assert!(!context.channel_state.is_monitor_update_in_progress()); // We have not had any monitor(s) yet to fail update!
-		if !matches!(
-			context.channel_state,
-			ChannelState::AwaitingChannelReady(flags) if flags.is_set(FundedStateFlags::INTERACTIVE_SIGNING.into())
-		) {
+		if !context.channel_state.is_interactive_signing() {
 			if context.is_batch_funding() {
 				context.channel_state = ChannelState::AwaitingChannelReady(AwaitingChannelReadyFlags::WAITING_FOR_BATCH);
 			} else {
@@ -10849,20 +10846,11 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 			&channel_parameters.counterparty_parameters.as_ref()
 				.expect("Persisted channel must have counterparty parameters").pubkeys.revocation_basepoint);
 
-		let interactive_tx_signing_session = if matches!(
-			channel_state,
-			ChannelState::AwaitingChannelReady(flags) if flags.is_set(FundedStateFlags::INTERACTIVE_SIGNING.into())
-		) {
-			if let Some(mut signing_session) = interactive_tx_signing_session {
-				if let Some(ref funding_tx) = funding_transaction {
-					signing_session.update_from_funding_tx_after_read(funding_tx);
-					Some(signing_session)
-				} else {
-					None
-				}
-			} else {
-				None
-			}
+		let interactive_tx_signing_session = if channel_state.is_interactive_signing() {
+			interactive_tx_signing_session.zip(funding_transaction.as_ref()).map(|(mut session, funding_tx)| {
+				session.update_from_funding_tx_after_read(funding_tx);
+				session
+			})
 		} else {
 			None
 		};