Implement From<OutboundV1Channel> for ChannelPhase

Exposing ChannelPhase in ChannelManager has led to verbose match
statements, which need to be modified each time a ChannelPhase is added.
Making ChannelPhase an implementation detail of Channel would help avoid
this.

As a step in this direction, define a conversion from OutboundV1Channel
to ChannelPhase (to be renamed Channel).

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1346,6 +1346,16 @@ impl<'a, SP: Deref> ChannelPhase<SP> where
 	}
 }
 
+impl<SP: Deref> From<OutboundV1Channel<SP>> for ChannelPhase<SP>
+where
+	SP::Target: SignerProvider,
+	<SP::Target as SignerProvider>::EcdsaSigner: ChannelSigner,
+{
+	fn from(channel: OutboundV1Channel<SP>) -> Self {
+		ChannelPhase::UnfundedOutboundV1(channel)
+	}
+}
+
 impl<SP: Deref> From<Channel<SP>> for ChannelPhase<SP>
 where
 	SP::Target: SignerProvider,

lightning/src/ln/channelmanager.rs

@@ -3668,7 +3668,7 @@ where
 					panic!("RNG is bad???");
 				}
 			},
-			hash_map::Entry::Vacant(entry) => { entry.insert(ChannelPhase::UnfundedOutboundV1(channel)); }
+			hash_map::Entry::Vacant(entry) => { entry.insert(ChannelPhase::from(channel)); }
 		}
 
 		if let Some(msg) = res {
@@ -5116,7 +5116,7 @@ where
 						return Err(APIError::ChannelUnavailable { err });
 					}
 				}
-				e.insert(ChannelPhase::UnfundedOutboundV1(chan));
+				e.insert(ChannelPhase::from(chan));
 			}
 		}
 		Ok(())