Skip to content

Commit 9cddec1

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent 42766a1 commit 9cddec1

File tree

1 file changed

+58
-91
lines changed

1 file changed

+58
-91
lines changed

‎lightning/src/ln/channelmanager.rs‎

Lines changed: 58 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,8 @@ impl MsgHandleErrInternal {
957957
}
958958
}
959959

960-
fn no_such_peer(counterparty_node_id: &PublicKey, channel_id: ChannelId) -> Self {
960+
fn unreachable_no_such_peer(counterparty_node_id: &PublicKey, channel_id: ChannelId) -> Self {
961+
debug_assert!(false);
961962
let err =
962963
format!("No such peer for the passed counterparty_node_id {counterparty_node_id}");
963964
Self::send_err_msg_no_close(err, channel_id)
@@ -10863,8 +10864,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1086310864

1086410865
let per_peer_state = self.per_peer_state.read().unwrap();
1086510866
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10866-
debug_assert!(false);
10867-
MsgHandleErrInternal::no_such_peer(
10867+
MsgHandleErrInternal::unreachable_no_such_peer(
1086810868
counterparty_node_id,
1086910869
common_fields.temporary_channel_id,
1087010870
)
@@ -10934,11 +10934,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1093410934
// likely to be lost on restart!
1093510935
let (value, output_script, user_id) = {
1093610936
let per_peer_state = self.per_peer_state.read().unwrap();
10937-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
10938-
.ok_or_else(|| {
10939-
debug_assert!(false);
10940-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.common_fields.temporary_channel_id)
10941-
})?;
10937+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10938+
MsgHandleErrInternal::unreachable_no_such_peer(
10939+
counterparty_node_id,
10940+
msg.common_fields.temporary_channel_id,
10941+
)
10942+
})?;
1094210943
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1094310944
let peer_state = &mut *peer_state_lock;
1094410945
match peer_state.channel_by_id.entry(msg.common_fields.temporary_channel_id) {
@@ -10979,8 +10980,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1097910980

1098010981
let per_peer_state = self.per_peer_state.read().unwrap();
1098110982
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10982-
debug_assert!(false);
10983-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.temporary_channel_id)
10983+
MsgHandleErrInternal::unreachable_no_such_peer(
10984+
counterparty_node_id,
10985+
msg.temporary_channel_id,
10986+
)
1098410987
})?;
1098510988

1098610989
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -11174,11 +11177,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1117411177
#[rustfmt::skip]
1117511178
fn internal_peer_storage(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorage) -> Result<(), MsgHandleErrInternal> {
1117611179
let per_peer_state = self.per_peer_state.read().unwrap();
11177-
let peer_state_mutex = per_peer_state.get(&counterparty_node_id)
11178-
.ok_or_else(|| {
11179-
debug_assert!(false);
11180-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11181-
})?;
11180+
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11181+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11182+
})?;
1118211183

1118311184
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1118411185
let peer_state = &mut *peer_state_lock;
@@ -11212,11 +11213,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1121211213
fn internal_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1121311214
let best_block = *self.best_block.read().unwrap();
1121411215
let per_peer_state = self.per_peer_state.read().unwrap();
11215-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11216-
.ok_or_else(|| {
11217-
debug_assert!(false);
11218-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11219-
})?;
11216+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11217+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11218+
})?;
1122011219

1122111220
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1122211221
let peer_state = &mut *peer_state_lock;
@@ -11269,8 +11268,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1126911268
) -> Result<(), MsgHandleErrInternal> {
1127011269
let per_peer_state = self.per_peer_state.read().unwrap();
1127111270
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11272-
debug_assert!(false);
11273-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
11271+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
1127411272
})?;
1127511273
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1127611274
let peer_state = &mut *peer_state_lock;
@@ -11354,8 +11352,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1135411352
) -> Result<(), MsgHandleErrInternal> {
1135511353
let per_peer_state = self.per_peer_state.read().unwrap();
1135611354
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11357-
debug_assert!(false);
11358-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id)
11355+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, msg.channel_id)
1135911356
})?;
1136011357
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1136111358
let peer_state = &mut *peer_state_lock;
@@ -11475,8 +11472,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1147511472
let (result, holding_cell_res) = {
1147611473
let per_peer_state = self.per_peer_state.read().unwrap();
1147711474
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11478-
debug_assert!(false);
11479-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11475+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1148011476
})?;
1148111477
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1148211478
let peer_state = &mut *peer_state_lock;
@@ -11580,8 +11576,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1158011576
let (result, holding_cell_res) = {
1158111577
let per_peer_state = self.per_peer_state.read().unwrap();
1158211578
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11583-
debug_assert!(false);
11584-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11579+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1158511580
})?;
1158611581
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1158711582
let peer_state = &mut *peer_state_lock;
@@ -11646,11 +11641,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1164611641
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1164711642
// closing a channel), so any changes are likely to be lost on restart!
1164811643
let per_peer_state = self.per_peer_state.read().unwrap();
11649-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11650-
.ok_or_else(|| {
11651-
debug_assert!(false);
11652-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11653-
})?;
11644+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11645+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11646+
})?;
1165411647
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1165511648
let peer_state = &mut *peer_state_lock;
1165611649
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11712,8 +11705,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1171211705
{
1171311706
let per_peer_state = self.per_peer_state.read().unwrap();
1171411707
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11715-
debug_assert!(false);
11716-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11708+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1171711709
})?;
1171811710
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1171911711
let peer_state = &mut *peer_state_lock;
@@ -11816,8 +11808,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1181611808
) -> Result<(), MsgHandleErrInternal> {
1181711809
let per_peer_state = self.per_peer_state.read().unwrap();
1181811810
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11819-
debug_assert!(false);
11820-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11811+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1182111812
})?;
1182211813
let logger;
1182311814
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -11919,11 +11910,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1191911910
// closing a channel), so any changes are likely to be lost on restart!
1192011911

1192111912
let per_peer_state = self.per_peer_state.read().unwrap();
11922-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11923-
.ok_or_else(|| {
11924-
debug_assert!(false);
11925-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11926-
})?;
11913+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11914+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11915+
})?;
1192711916
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1192811917
let peer_state = &mut *peer_state_lock;
1192911918
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11948,8 +11937,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1194811937
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1194911938
let per_peer_state = self.per_peer_state.read().unwrap();
1195011939
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11951-
debug_assert!(false);
11952-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11940+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1195311941
})?;
1195411942
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1195511943
let peer_state = &mut *peer_state_lock;
@@ -12030,11 +12018,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1203012018
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1203112019
// closing a channel), so any changes are likely to be lost on restart!
1203212020
let per_peer_state = self.per_peer_state.read().unwrap();
12033-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12034-
.ok_or_else(|| {
12035-
debug_assert!(false);
12036-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12037-
})?;
12021+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12022+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12023+
})?;
1203812024
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1203912025
let peer_state = &mut *peer_state_lock;
1204012026
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12056,11 +12042,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1205612042
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1205712043
// closing a channel), so any changes are likely to be lost on restart!
1205812044
let per_peer_state = self.per_peer_state.read().unwrap();
12059-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12060-
.ok_or_else(|| {
12061-
debug_assert!(false);
12062-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12063-
})?;
12045+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12046+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12047+
})?;
1206412048
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1206512049
let peer_state = &mut *peer_state_lock;
1206612050
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12087,8 +12071,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1208712071
let best_block = *self.best_block.read().unwrap();
1208812072
let per_peer_state = self.per_peer_state.read().unwrap();
1208912073
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12090-
debug_assert!(false);
12091-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12074+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1209212075
})?;
1209312076
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1209412077
let peer_state = &mut *peer_state_lock;
@@ -12164,11 +12147,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1216412147
#[rustfmt::skip]
1216512148
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1216612149
let per_peer_state = self.per_peer_state.read().unwrap();
12167-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12168-
.ok_or_else(|| {
12169-
debug_assert!(false);
12170-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12171-
})?;
12150+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12151+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12152+
})?;
1217212153
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1217312154
let peer_state = &mut *peer_state_lock;
1217412155
match peer_state.channel_by_id.entry(channel_id) {
@@ -12306,11 +12287,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1230612287
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1230712288
let (htlcs_to_fail, static_invoices) = {
1230812289
let per_peer_state = self.per_peer_state.read().unwrap();
12309-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12310-
.ok_or_else(|| {
12311-
debug_assert!(false);
12312-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12313-
}).map(|mtx| mtx.lock().unwrap())?;
12290+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12291+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12292+
}).map(|mtx| mtx.lock().unwrap())?;
1231412293
let peer_state = &mut *peer_state_lock;
1231512294
match peer_state.channel_by_id.entry(msg.channel_id) {
1231612295
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12359,11 +12338,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1235912338
#[rustfmt::skip]
1236012339
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1236112340
let per_peer_state = self.per_peer_state.read().unwrap();
12362-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12363-
.ok_or_else(|| {
12364-
debug_assert!(false);
12365-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12366-
})?;
12341+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12342+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12343+
})?;
1236712344
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1236812345
let peer_state = &mut *peer_state_lock;
1236912346
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12385,9 +12362,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1238512362
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1238612363
let per_peer_state = self.per_peer_state.read().unwrap();
1238712364
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12388-
debug_assert!(false);
12389-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12390-
)
12365+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1239112366
})?;
1239212367
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1239312368
let peer_state = &mut *peer_state_lock;
@@ -12440,11 +12415,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1244012415
#[rustfmt::skip]
1244112416
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1244212417
let per_peer_state = self.per_peer_state.read().unwrap();
12443-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12444-
.ok_or_else(|| {
12445-
debug_assert!(false);
12446-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12447-
})?;
12418+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12419+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12420+
})?;
1244812421
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1244912422
let peer_state = &mut *peer_state_lock;
1245012423
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12539,12 +12512,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1253912512
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1254012513
let per_peer_state = self.per_peer_state.read().unwrap();
1254112514

12542-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12543-
.ok_or_else(|| {
12544-
debug_assert!(false);
12545-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12546-
)
12547-
})?;
12515+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12516+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12517+
})?;
1254812518
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1254912519
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1255012520
let peer_state = &mut *peer_state_lock;
@@ -12656,8 +12626,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1265612626
) -> Result<(), MsgHandleErrInternal> {
1265712627
let per_peer_state = self.per_peer_state.read().unwrap();
1265812628
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12659-
debug_assert!(false);
12660-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12629+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1266112630
})?;
1266212631
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1266312632
let peer_state = &mut *peer_state_lock;
@@ -12714,8 +12683,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1271412683
) -> Result<(), MsgHandleErrInternal> {
1271512684
let per_peer_state = self.per_peer_state.read().unwrap();
1271612685
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12717-
debug_assert!(false);
12718-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12686+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1271912687
})?;
1272012688
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1272112689
let peer_state = &mut *peer_state_lock;
@@ -12760,8 +12728,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1276012728
) -> Result<(), MsgHandleErrInternal> {
1276112729
let per_peer_state = self.per_peer_state.read().unwrap();
1276212730
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12763-
debug_assert!(false);
12764-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12731+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1276512732
})?;
1276612733
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1276712734
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)