@@ -1158,8 +1158,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
1158
1158
1159
1159
let their_features = {
1160
1160
let per_peer_state = self . per_peer_state . read ( ) . unwrap ( ) ;
1161
- let peer_state = per_peer_state. get ( & their_network_key) . unwrap ( ) . lock ( ) . unwrap ( ) ;
1162
- peer_state. latest_features . clone ( )
1161
+ match per_peer_state. get ( & their_network_key) {
1162
+ Some ( peer_state) => peer_state. lock ( ) . unwrap ( ) . latest_features . clone ( ) ,
1163
+ None => return Err ( APIError :: ChannelUnavailable { err : format ! ( "Not connected to node: {}" , their_network_key) } ) ,
1164
+ }
1163
1165
} ;
1164
1166
let config = if override_config. is_some ( ) { override_config. as_ref ( ) . unwrap ( ) } else { & self . default_configuration } ;
1165
1167
let channel = Channel :: new_outbound ( & self . fee_estimator , & self . keys_manager , their_network_key, their_features, channel_value_satoshis, push_msat, user_id, config) ?;
@@ -1264,8 +1266,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
1264
1266
let counterparty_node_id = chan_entry. get ( ) . get_counterparty_node_id ( ) ;
1265
1267
let their_features = {
1266
1268
let per_peer_state = self . per_peer_state . read ( ) . unwrap ( ) ;
1267
- let peer_state = per_peer_state. get ( & counterparty_node_id) . unwrap ( ) . lock ( ) . unwrap ( ) ;
1268
- peer_state. latest_features . clone ( )
1269
+ match per_peer_state. get ( & counterparty_node_id) {
1270
+ Some ( peer_state) => peer_state. lock ( ) . unwrap ( ) . latest_features . clone ( ) ,
1271
+ None => return Err ( APIError :: ChannelUnavailable { err : format ! ( "Not connected to node: {}" , counterparty_node_id) } ) ,
1272
+ }
1269
1273
} ;
1270
1274
let ( shutdown_msg, monitor_update, failed_htlcs) = chan_entry. get_mut ( ) . get_shutdown ( & self . keys_manager , & their_features) ?;
1271
1275
channel_state. pending_msg_events . push ( events:: MessageSendEvent :: SendShutdown {
0 commit comments