Skip to content

Commit 6257bf1

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent 00254b9 commit 6257bf1

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)
@@ -10949,8 +10950,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1094910950

1095010951
let per_peer_state = self.per_peer_state.read().unwrap();
1095110952
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10952-
debug_assert!(false);
10953-
MsgHandleErrInternal::no_such_peer(
10953+
MsgHandleErrInternal::unreachable_no_such_peer(
1095410954
counterparty_node_id,
1095510955
common_fields.temporary_channel_id,
1095610956
)
@@ -11020,11 +11020,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1102011020
// likely to be lost on restart!
1102111021
let (value, output_script, user_id) = {
1102211022
let per_peer_state = self.per_peer_state.read().unwrap();
11023-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11024-
.ok_or_else(|| {
11025-
debug_assert!(false);
11026-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.common_fields.temporary_channel_id)
11027-
})?;
11023+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11024+
MsgHandleErrInternal::unreachable_no_such_peer(
11025+
counterparty_node_id,
11026+
msg.common_fields.temporary_channel_id,
11027+
)
11028+
})?;
1102811029
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1102911030
let peer_state = &mut *peer_state_lock;
1103011031
match peer_state.channel_by_id.entry(msg.common_fields.temporary_channel_id) {
@@ -11065,8 +11066,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1106511066

1106611067
let per_peer_state = self.per_peer_state.read().unwrap();
1106711068
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11068-
debug_assert!(false);
11069-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.temporary_channel_id)
11069+
MsgHandleErrInternal::unreachable_no_such_peer(
11070+
counterparty_node_id,
11071+
msg.temporary_channel_id,
11072+
)
1107011073
})?;
1107111074

1107211075
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -11260,11 +11263,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1126011263
#[rustfmt::skip]
1126111264
fn internal_peer_storage(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorage) -> Result<(), MsgHandleErrInternal> {
1126211265
let per_peer_state = self.per_peer_state.read().unwrap();
11263-
let peer_state_mutex = per_peer_state.get(&counterparty_node_id)
11264-
.ok_or_else(|| {
11265-
debug_assert!(false);
11266-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11267-
})?;
11266+
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11267+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11268+
})?;
1126811269

1126911270
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1127011271
let peer_state = &mut *peer_state_lock;
@@ -11298,11 +11299,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1129811299
fn internal_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1129911300
let best_block = *self.best_block.read().unwrap();
1130011301
let per_peer_state = self.per_peer_state.read().unwrap();
11301-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11302-
.ok_or_else(|| {
11303-
debug_assert!(false);
11304-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11305-
})?;
11302+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11303+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11304+
})?;
1130611305

1130711306
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1130811307
let peer_state = &mut *peer_state_lock;
@@ -11355,8 +11354,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1135511354
) -> Result<(), MsgHandleErrInternal> {
1135611355
let per_peer_state = self.per_peer_state.read().unwrap();
1135711356
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11358-
debug_assert!(false);
11359-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
11357+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
1136011358
})?;
1136111359
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1136211360
let peer_state = &mut *peer_state_lock;
@@ -11440,8 +11438,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1144011438
) -> Result<(), MsgHandleErrInternal> {
1144111439
let per_peer_state = self.per_peer_state.read().unwrap();
1144211440
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11443-
debug_assert!(false);
11444-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id)
11441+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, msg.channel_id)
1144511442
})?;
1144611443
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1144711444
let peer_state = &mut *peer_state_lock;
@@ -11561,8 +11558,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1156111558
let (result, holding_cell_res) = {
1156211559
let per_peer_state = self.per_peer_state.read().unwrap();
1156311560
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11564-
debug_assert!(false);
11565-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11561+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1156611562
})?;
1156711563
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1156811564
let peer_state = &mut *peer_state_lock;
@@ -11666,8 +11662,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1166611662
let (result, holding_cell_res) = {
1166711663
let per_peer_state = self.per_peer_state.read().unwrap();
1166811664
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11669-
debug_assert!(false);
11670-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11665+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1167111666
})?;
1167211667
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1167311668
let peer_state = &mut *peer_state_lock;
@@ -11732,11 +11727,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1173211727
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1173311728
// closing a channel), so any changes are likely to be lost on restart!
1173411729
let per_peer_state = self.per_peer_state.read().unwrap();
11735-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11736-
.ok_or_else(|| {
11737-
debug_assert!(false);
11738-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11739-
})?;
11730+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11731+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11732+
})?;
1174011733
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1174111734
let peer_state = &mut *peer_state_lock;
1174211735
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11798,8 +11791,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1179811791
{
1179911792
let per_peer_state = self.per_peer_state.read().unwrap();
1180011793
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11801-
debug_assert!(false);
11802-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11794+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1180311795
})?;
1180411796
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1180511797
let peer_state = &mut *peer_state_lock;
@@ -11902,8 +11894,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1190211894
) -> Result<(), MsgHandleErrInternal> {
1190311895
let per_peer_state = self.per_peer_state.read().unwrap();
1190411896
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11905-
debug_assert!(false);
11906-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11897+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1190711898
})?;
1190811899
let logger;
1190911900
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -12005,11 +11996,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1200511996
// closing a channel), so any changes are likely to be lost on restart!
1200611997

1200711998
let per_peer_state = self.per_peer_state.read().unwrap();
12008-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12009-
.ok_or_else(|| {
12010-
debug_assert!(false);
12011-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12012-
})?;
11999+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12000+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12001+
})?;
1201312002
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1201412003
let peer_state = &mut *peer_state_lock;
1201512004
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12034,8 +12023,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1203412023
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1203512024
let per_peer_state = self.per_peer_state.read().unwrap();
1203612025
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12037-
debug_assert!(false);
12038-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12026+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1203912027
})?;
1204012028
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1204112029
let peer_state = &mut *peer_state_lock;
@@ -12116,11 +12104,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1211612104
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1211712105
// closing a channel), so any changes are likely to be lost on restart!
1211812106
let per_peer_state = self.per_peer_state.read().unwrap();
12119-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12120-
.ok_or_else(|| {
12121-
debug_assert!(false);
12122-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12123-
})?;
12107+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12108+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12109+
})?;
1212412110
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1212512111
let peer_state = &mut *peer_state_lock;
1212612112
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12142,11 +12128,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1214212128
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1214312129
// closing a channel), so any changes are likely to be lost on restart!
1214412130
let per_peer_state = self.per_peer_state.read().unwrap();
12145-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12146-
.ok_or_else(|| {
12147-
debug_assert!(false);
12148-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12149-
})?;
12131+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12132+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12133+
})?;
1215012134
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1215112135
let peer_state = &mut *peer_state_lock;
1215212136
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12173,8 +12157,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1217312157
let best_block = *self.best_block.read().unwrap();
1217412158
let per_peer_state = self.per_peer_state.read().unwrap();
1217512159
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12176-
debug_assert!(false);
12177-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12160+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1217812161
})?;
1217912162
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1218012163
let peer_state = &mut *peer_state_lock;
@@ -12250,11 +12233,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1225012233
#[rustfmt::skip]
1225112234
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1225212235
let per_peer_state = self.per_peer_state.read().unwrap();
12253-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12254-
.ok_or_else(|| {
12255-
debug_assert!(false);
12256-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12257-
})?;
12236+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12237+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12238+
})?;
1225812239
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1225912240
let peer_state = &mut *peer_state_lock;
1226012241
match peer_state.channel_by_id.entry(channel_id) {
@@ -12392,11 +12373,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1239212373
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1239312374
let (htlcs_to_fail, static_invoices) = {
1239412375
let per_peer_state = self.per_peer_state.read().unwrap();
12395-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12396-
.ok_or_else(|| {
12397-
debug_assert!(false);
12398-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12399-
}).map(|mtx| mtx.lock().unwrap())?;
12376+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12377+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12378+
}).map(|mtx| mtx.lock().unwrap())?;
1240012379
let peer_state = &mut *peer_state_lock;
1240112380
match peer_state.channel_by_id.entry(msg.channel_id) {
1240212381
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12445,11 +12424,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1244512424
#[rustfmt::skip]
1244612425
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1244712426
let per_peer_state = self.per_peer_state.read().unwrap();
12448-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12449-
.ok_or_else(|| {
12450-
debug_assert!(false);
12451-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12452-
})?;
12427+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12428+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12429+
})?;
1245312430
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1245412431
let peer_state = &mut *peer_state_lock;
1245512432
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12471,9 +12448,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1247112448
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1247212449
let per_peer_state = self.per_peer_state.read().unwrap();
1247312450
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12474-
debug_assert!(false);
12475-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12476-
)
12451+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1247712452
})?;
1247812453
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1247912454
let peer_state = &mut *peer_state_lock;
@@ -12526,11 +12501,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1252612501
#[rustfmt::skip]
1252712502
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1252812503
let per_peer_state = self.per_peer_state.read().unwrap();
12529-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12530-
.ok_or_else(|| {
12531-
debug_assert!(false);
12532-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12533-
})?;
12504+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12505+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12506+
})?;
1253412507
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1253512508
let peer_state = &mut *peer_state_lock;
1253612509
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12625,12 +12598,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1262512598
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1262612599
let per_peer_state = self.per_peer_state.read().unwrap();
1262712600

12628-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12629-
.ok_or_else(|| {
12630-
debug_assert!(false);
12631-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12632-
)
12633-
})?;
12601+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12602+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12603+
})?;
1263412604
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1263512605
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1263612606
let peer_state = &mut *peer_state_lock;
@@ -12742,8 +12712,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1274212712
) -> Result<(), MsgHandleErrInternal> {
1274312713
let per_peer_state = self.per_peer_state.read().unwrap();
1274412714
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12745-
debug_assert!(false);
12746-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12715+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1274712716
})?;
1274812717
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1274912718
let peer_state = &mut *peer_state_lock;
@@ -12800,8 +12769,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1280012769
) -> Result<(), MsgHandleErrInternal> {
1280112770
let per_peer_state = self.per_peer_state.read().unwrap();
1280212771
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12803-
debug_assert!(false);
12804-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12772+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1280512773
})?;
1280612774
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1280712775
let peer_state = &mut *peer_state_lock;
@@ -12846,8 +12814,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1284612814
) -> Result<(), MsgHandleErrInternal> {
1284712815
let per_peer_state = self.per_peer_state.read().unwrap();
1284812816
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12849-
debug_assert!(false);
12850-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12817+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1285112818
})?;
1285212819
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1285312820
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)