File tree 2 files changed +8
-12
lines changed
2 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -8882,14 +8882,12 @@ impl<SP: Deref> OutboundV2Channel<SP> where SP::Target: SignerProvider {
8882
8882
}
8883
8883
}
8884
8884
8885
- pub fn into_channel(self) -> Result< Channel<SP>, ChannelError> {
8885
+ pub fn into_channel(self) -> Channel<SP> {
8886
8886
debug_assert!(self.signing_session.is_some());
8887
- let channel = Channel {
8887
+ Channel {
8888
8888
context: self.context,
8889
8889
interactive_tx_signing_session: self.signing_session,
8890
- };
8891
-
8892
- Ok(channel)
8890
+ }
8893
8891
}
8894
8892
}
8895
8893
@@ -9079,14 +9077,12 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
9079
9077
self.generate_accept_channel_v2_message()
9080
9078
}
9081
9079
9082
- pub fn into_channel(self) -> Result< Channel<SP>, ChannelError> {
9080
+ pub fn into_channel(self) -> Channel<SP> {
9083
9081
debug_assert!(self.signing_session.is_some());
9084
- let channel = Channel {
9082
+ Channel {
9085
9083
context: self.context,
9086
9084
interactive_tx_signing_session: self.signing_session,
9087
- };
9088
-
9089
- Ok(channel)
9085
+ }
9090
9086
}
9091
9087
}
9092
9088
Original file line number Diff line number Diff line change @@ -8332,8 +8332,8 @@ where
8332
8332
8333
8333
let (channel_id, channel_phase) = chan_phase_entry.remove_entry();
8334
8334
let channel = match channel_phase {
8335
- ChannelPhase::UnfundedOutboundV2(chan) => chan.into_channel(),
8336
- ChannelPhase::UnfundedInboundV2(chan) => chan.into_channel(),
8335
+ ChannelPhase::UnfundedOutboundV2(chan) => Ok( chan.into_channel() ),
8336
+ ChannelPhase::UnfundedInboundV2(chan) => Ok( chan.into_channel() ),
8337
8337
_ => {
8338
8338
debug_assert!(false); // It cannot be another variant as we are in the `Ok` branch of the above match.
8339
8339
Err(ChannelError::Warn(
You can’t perform that action at this time.
0 commit comments