Skip to content

Commit e4f2906

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent 2552104 commit e4f2906

File tree

1 file changed

+67
-91
lines changed

1 file changed

+67
-91
lines changed

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 67 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,8 @@ impl MsgHandleErrInternal {
955955
}
956956
}
957957

958-
fn no_such_peer(counterparty_node_id: &PublicKey, channel_id: ChannelId) -> Self {
958+
fn unreachable_no_such_peer(counterparty_node_id: &PublicKey, channel_id: ChannelId) -> Self {
959+
debug_assert!(false);
959960
let err =
960961
format!("No such peer for the passed counterparty_node_id {counterparty_node_id}");
961962
Self::send_err_msg_no_close(err, channel_id)
@@ -10793,8 +10794,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1079310794

1079410795
let per_peer_state = self.per_peer_state.read().unwrap();
1079510796
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10796-
debug_assert!(false);
10797-
MsgHandleErrInternal::no_such_peer(
10797+
MsgHandleErrInternal::unreachable_no_such_peer(
1079810798
counterparty_node_id,
1079910799
common_fields.temporary_channel_id,
1080010800
)
@@ -10864,11 +10864,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1086410864
// likely to be lost on restart!
1086510865
let (value, output_script, user_id) = {
1086610866
let per_peer_state = self.per_peer_state.read().unwrap();
10867-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
10868-
.ok_or_else(|| {
10869-
debug_assert!(false);
10870-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.common_fields.temporary_channel_id)
10871-
})?;
10867+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10868+
MsgHandleErrInternal::unreachable_no_such_peer(
10869+
counterparty_node_id,
10870+
msg.common_fields.temporary_channel_id,
10871+
)
10872+
})?;
1087210873
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1087310874
let peer_state = &mut *peer_state_lock;
1087410875
match peer_state.channel_by_id.entry(msg.common_fields.temporary_channel_id) {
@@ -10909,8 +10910,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1090910910

1091010911
let per_peer_state = self.per_peer_state.read().unwrap();
1091110912
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10912-
debug_assert!(false);
10913-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.temporary_channel_id)
10913+
MsgHandleErrInternal::unreachable_no_such_peer(
10914+
counterparty_node_id,
10915+
msg.temporary_channel_id,
10916+
)
1091410917
})?;
1091510918

1091610919
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -11104,11 +11107,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1110411107
#[rustfmt::skip]
1110511108
fn internal_peer_storage(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorage) -> Result<(), MsgHandleErrInternal> {
1110611109
let per_peer_state = self.per_peer_state.read().unwrap();
11107-
let peer_state_mutex = per_peer_state.get(&counterparty_node_id)
11108-
.ok_or_else(|| {
11109-
debug_assert!(false);
11110-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11111-
})?;
11110+
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11111+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11112+
})?;
1111211113

1111311114
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1111411115
let peer_state = &mut *peer_state_lock;
@@ -11142,11 +11143,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1114211143
fn internal_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1114311144
let best_block = *self.best_block.read().unwrap();
1114411145
let per_peer_state = self.per_peer_state.read().unwrap();
11145-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11146-
.ok_or_else(|| {
11147-
debug_assert!(false);
11148-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11149-
})?;
11146+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11147+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11148+
})?;
1115011149

1115111150
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1115211151
let peer_state = &mut *peer_state_lock;
@@ -11199,8 +11198,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1119911198
) -> Result<(), (MsgHandleErrInternal, bool)> {
1120011199
let per_peer_state = self.per_peer_state.read().unwrap();
1120111200
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11202-
debug_assert!(false);
11203-
(MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id), false)
11201+
(
11202+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id),
11203+
false,
11204+
)
1120411205
})?;
1120511206
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1120611207
let peer_state = &mut *peer_state_lock;
@@ -11286,8 +11287,13 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1128611287
) -> Result<NotifyOption, (MsgHandleErrInternal, bool)> {
1128711288
let per_peer_state = self.per_peer_state.read().unwrap();
1128811289
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11289-
debug_assert!(false);
11290-
(MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id), false)
11290+
(
11291+
MsgHandleErrInternal::unreachable_no_such_peer(
11292+
&counterparty_node_id,
11293+
msg.channel_id,
11294+
),
11295+
false,
11296+
)
1129111297
})?;
1129211298
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1129311299
let peer_state = &mut *peer_state_lock;
@@ -11413,8 +11419,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1141311419
let (result, holding_cell_res) = {
1141411420
let per_peer_state = self.per_peer_state.read().unwrap();
1141511421
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11416-
debug_assert!(false);
11417-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11422+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1141811423
})?;
1141911424
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1142011425
let peer_state = &mut *peer_state_lock;
@@ -11518,8 +11523,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1151811523
let (result, holding_cell_res) = {
1151911524
let per_peer_state = self.per_peer_state.read().unwrap();
1152011525
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11521-
debug_assert!(false);
11522-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11526+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1152311527
})?;
1152411528
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1152511529
let peer_state = &mut *peer_state_lock;
@@ -11584,11 +11588,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1158411588
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1158511589
// closing a channel), so any changes are likely to be lost on restart!
1158611590
let per_peer_state = self.per_peer_state.read().unwrap();
11587-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11588-
.ok_or_else(|| {
11589-
debug_assert!(false);
11590-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11591-
})?;
11591+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11592+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11593+
})?;
1159211594
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1159311595
let peer_state = &mut *peer_state_lock;
1159411596
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11650,8 +11652,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1165011652
{
1165111653
let per_peer_state = self.per_peer_state.read().unwrap();
1165211654
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11653-
debug_assert!(false);
11654-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11655+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1165511656
})?;
1165611657
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1165711658
let peer_state = &mut *peer_state_lock;
@@ -11754,8 +11755,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1175411755
) -> Result<(), MsgHandleErrInternal> {
1175511756
let per_peer_state = self.per_peer_state.read().unwrap();
1175611757
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11757-
debug_assert!(false);
11758-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11758+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1175911759
})?;
1176011760
let logger;
1176111761
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -11857,11 +11857,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1185711857
// closing a channel), so any changes are likely to be lost on restart!
1185811858

1185911859
let per_peer_state = self.per_peer_state.read().unwrap();
11860-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11861-
.ok_or_else(|| {
11862-
debug_assert!(false);
11863-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11864-
})?;
11860+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11861+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11862+
})?;
1186511863
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1186611864
let peer_state = &mut *peer_state_lock;
1186711865
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11886,8 +11884,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1188611884
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1188711885
let per_peer_state = self.per_peer_state.read().unwrap();
1188811886
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11889-
debug_assert!(false);
11890-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11887+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1189111888
})?;
1189211889
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1189311890
let peer_state = &mut *peer_state_lock;
@@ -11968,11 +11965,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1196811965
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1196911966
// closing a channel), so any changes are likely to be lost on restart!
1197011967
let per_peer_state = self.per_peer_state.read().unwrap();
11971-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11972-
.ok_or_else(|| {
11973-
debug_assert!(false);
11974-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11975-
})?;
11968+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11969+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11970+
})?;
1197611971
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1197711972
let peer_state = &mut *peer_state_lock;
1197811973
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11994,11 +11989,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1199411989
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1199511990
// closing a channel), so any changes are likely to be lost on restart!
1199611991
let per_peer_state = self.per_peer_state.read().unwrap();
11997-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11998-
.ok_or_else(|| {
11999-
debug_assert!(false);
12000-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12001-
})?;
11992+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11993+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11994+
})?;
1200211995
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1200311996
let peer_state = &mut *peer_state_lock;
1200411997
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12025,8 +12018,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1202512018
let best_block = *self.best_block.read().unwrap();
1202612019
let per_peer_state = self.per_peer_state.read().unwrap();
1202712020
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12028-
debug_assert!(false);
12029-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12021+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1203012022
})?;
1203112023
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1203212024
let peer_state = &mut *peer_state_lock;
@@ -12102,11 +12094,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1210212094
#[rustfmt::skip]
1210312095
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1210412096
let per_peer_state = self.per_peer_state.read().unwrap();
12105-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12106-
.ok_or_else(|| {
12107-
debug_assert!(false);
12108-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12109-
})?;
12097+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12098+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12099+
})?;
1211012100
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1211112101
let peer_state = &mut *peer_state_lock;
1211212102
match peer_state.channel_by_id.entry(channel_id) {
@@ -12244,11 +12234,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1224412234
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1224512235
let (htlcs_to_fail, static_invoices) = {
1224612236
let per_peer_state = self.per_peer_state.read().unwrap();
12247-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12248-
.ok_or_else(|| {
12249-
debug_assert!(false);
12250-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12251-
}).map(|mtx| mtx.lock().unwrap())?;
12237+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12238+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12239+
}).map(|mtx| mtx.lock().unwrap())?;
1225212240
let peer_state = &mut *peer_state_lock;
1225312241
match peer_state.channel_by_id.entry(msg.channel_id) {
1225412242
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12297,11 +12285,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1229712285
#[rustfmt::skip]
1229812286
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1229912287
let per_peer_state = self.per_peer_state.read().unwrap();
12300-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12301-
.ok_or_else(|| {
12302-
debug_assert!(false);
12303-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12304-
})?;
12288+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12289+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12290+
})?;
1230512291
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1230612292
let peer_state = &mut *peer_state_lock;
1230712293
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12323,9 +12309,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1232312309
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1232412310
let per_peer_state = self.per_peer_state.read().unwrap();
1232512311
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12326-
debug_assert!(false);
12327-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12328-
)
12312+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1232912313
})?;
1233012314
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1233112315
let peer_state = &mut *peer_state_lock;
@@ -12378,11 +12362,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1237812362
#[rustfmt::skip]
1237912363
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1238012364
let per_peer_state = self.per_peer_state.read().unwrap();
12381-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12382-
.ok_or_else(|| {
12383-
debug_assert!(false);
12384-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12385-
})?;
12365+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12366+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12367+
})?;
1238612368
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1238712369
let peer_state = &mut *peer_state_lock;
1238812370
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12477,12 +12459,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1247712459
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1247812460
let per_peer_state = self.per_peer_state.read().unwrap();
1247912461

12480-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12481-
.ok_or_else(|| {
12482-
debug_assert!(false);
12483-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12484-
)
12485-
})?;
12462+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12463+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12464+
})?;
1248612465
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1248712466
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1248812467
let peer_state = &mut *peer_state_lock;
@@ -12594,8 +12573,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1259412573
) -> Result<(), MsgHandleErrInternal> {
1259512574
let per_peer_state = self.per_peer_state.read().unwrap();
1259612575
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12597-
debug_assert!(false);
12598-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12576+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1259912577
})?;
1260012578
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1260112579
let peer_state = &mut *peer_state_lock;
@@ -12652,8 +12630,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1265212630
) -> Result<(), MsgHandleErrInternal> {
1265312631
let per_peer_state = self.per_peer_state.read().unwrap();
1265412632
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12655-
debug_assert!(false);
12656-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12633+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1265712634
})?;
1265812635
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1265912636
let peer_state = &mut *peer_state_lock;
@@ -12698,8 +12675,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1269812675
) -> Result<(), MsgHandleErrInternal> {
1269912676
let per_peer_state = self.per_peer_state.read().unwrap();
1270012677
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12701-
debug_assert!(false);
12702-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12678+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1270312679
})?;
1270412680
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1270512681
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)