Skip to content

Commit f6ea33e

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent c9827fc commit f6ea33e

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

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

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

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

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

1130811307
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1130911308
let peer_state = &mut *peer_state_lock;
@@ -11356,8 +11355,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1135611355
) -> Result<(), MsgHandleErrInternal> {
1135711356
let per_peer_state = self.per_peer_state.read().unwrap();
1135811357
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11359-
debug_assert!(false);
11360-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
11358+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
1136111359
})?;
1136211360
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1136311361
let peer_state = &mut *peer_state_lock;
@@ -11441,8 +11439,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1144111439
) -> Result<(), MsgHandleErrInternal> {
1144211440
let per_peer_state = self.per_peer_state.read().unwrap();
1144311441
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11444-
debug_assert!(false);
11445-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id)
11442+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, msg.channel_id)
1144611443
})?;
1144711444
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1144811445
let peer_state = &mut *peer_state_lock;
@@ -11562,8 +11559,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1156211559
let (result, holding_cell_res) = {
1156311560
let per_peer_state = self.per_peer_state.read().unwrap();
1156411561
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11565-
debug_assert!(false);
11566-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11562+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1156711563
})?;
1156811564
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1156911565
let peer_state = &mut *peer_state_lock;
@@ -11667,8 +11663,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1166711663
let (result, holding_cell_res) = {
1166811664
let per_peer_state = self.per_peer_state.read().unwrap();
1166911665
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11670-
debug_assert!(false);
11671-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11666+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1167211667
})?;
1167311668
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1167411669
let peer_state = &mut *peer_state_lock;
@@ -11733,11 +11728,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1173311728
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1173411729
// closing a channel), so any changes are likely to be lost on restart!
1173511730
let per_peer_state = self.per_peer_state.read().unwrap();
11736-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11737-
.ok_or_else(|| {
11738-
debug_assert!(false);
11739-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11740-
})?;
11731+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11732+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11733+
})?;
1174111734
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1174211735
let peer_state = &mut *peer_state_lock;
1174311736
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11799,8 +11792,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1179911792
{
1180011793
let per_peer_state = self.per_peer_state.read().unwrap();
1180111794
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11802-
debug_assert!(false);
11803-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11795+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1180411796
})?;
1180511797
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1180611798
let peer_state = &mut *peer_state_lock;
@@ -11903,8 +11895,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1190311895
) -> Result<(), MsgHandleErrInternal> {
1190411896
let per_peer_state = self.per_peer_state.read().unwrap();
1190511897
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11906-
debug_assert!(false);
11907-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11898+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1190811899
})?;
1190911900
let logger;
1191011901
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -12006,11 +11997,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1200611997
// closing a channel), so any changes are likely to be lost on restart!
1200711998

1200811999
let per_peer_state = self.per_peer_state.read().unwrap();
12009-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12010-
.ok_or_else(|| {
12011-
debug_assert!(false);
12012-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12013-
})?;
12000+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12001+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12002+
})?;
1201412003
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1201512004
let peer_state = &mut *peer_state_lock;
1201612005
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12035,8 +12024,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1203512024
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1203612025
let per_peer_state = self.per_peer_state.read().unwrap();
1203712026
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12038-
debug_assert!(false);
12039-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12027+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1204012028
})?;
1204112029
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1204212030
let peer_state = &mut *peer_state_lock;
@@ -12117,11 +12105,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1211712105
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1211812106
// closing a channel), so any changes are likely to be lost on restart!
1211912107
let per_peer_state = self.per_peer_state.read().unwrap();
12120-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12121-
.ok_or_else(|| {
12122-
debug_assert!(false);
12123-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12124-
})?;
12108+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12109+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12110+
})?;
1212512111
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1212612112
let peer_state = &mut *peer_state_lock;
1212712113
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12143,11 +12129,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1214312129
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1214412130
// closing a channel), so any changes are likely to be lost on restart!
1214512131
let per_peer_state = self.per_peer_state.read().unwrap();
12146-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12147-
.ok_or_else(|| {
12148-
debug_assert!(false);
12149-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12150-
})?;
12132+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12133+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12134+
})?;
1215112135
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1215212136
let peer_state = &mut *peer_state_lock;
1215312137
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12174,8 +12158,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1217412158
let best_block = *self.best_block.read().unwrap();
1217512159
let per_peer_state = self.per_peer_state.read().unwrap();
1217612160
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12177-
debug_assert!(false);
12178-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12161+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1217912162
})?;
1218012163
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1218112164
let peer_state = &mut *peer_state_lock;
@@ -12251,11 +12234,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1225112234
#[rustfmt::skip]
1225212235
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1225312236
let per_peer_state = self.per_peer_state.read().unwrap();
12254-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12255-
.ok_or_else(|| {
12256-
debug_assert!(false);
12257-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12258-
})?;
12237+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12238+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12239+
})?;
1225912240
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1226012241
let peer_state = &mut *peer_state_lock;
1226112242
match peer_state.channel_by_id.entry(channel_id) {
@@ -12393,11 +12374,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1239312374
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1239412375
let (htlcs_to_fail, static_invoices) = {
1239512376
let per_peer_state = self.per_peer_state.read().unwrap();
12396-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12397-
.ok_or_else(|| {
12398-
debug_assert!(false);
12399-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12400-
}).map(|mtx| mtx.lock().unwrap())?;
12377+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12378+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12379+
}).map(|mtx| mtx.lock().unwrap())?;
1240112380
let peer_state = &mut *peer_state_lock;
1240212381
match peer_state.channel_by_id.entry(msg.channel_id) {
1240312382
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12446,11 +12425,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1244612425
#[rustfmt::skip]
1244712426
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1244812427
let per_peer_state = self.per_peer_state.read().unwrap();
12449-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12450-
.ok_or_else(|| {
12451-
debug_assert!(false);
12452-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12453-
})?;
12428+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12429+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12430+
})?;
1245412431
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1245512432
let peer_state = &mut *peer_state_lock;
1245612433
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12472,9 +12449,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1247212449
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1247312450
let per_peer_state = self.per_peer_state.read().unwrap();
1247412451
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12475-
debug_assert!(false);
12476-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12477-
)
12452+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1247812453
})?;
1247912454
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1248012455
let peer_state = &mut *peer_state_lock;
@@ -12527,11 +12502,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1252712502
#[rustfmt::skip]
1252812503
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1252912504
let per_peer_state = self.per_peer_state.read().unwrap();
12530-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12531-
.ok_or_else(|| {
12532-
debug_assert!(false);
12533-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12534-
})?;
12505+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12506+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12507+
})?;
1253512508
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1253612509
let peer_state = &mut *peer_state_lock;
1253712510
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12626,12 +12599,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1262612599
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1262712600
let per_peer_state = self.per_peer_state.read().unwrap();
1262812601

12629-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12630-
.ok_or_else(|| {
12631-
debug_assert!(false);
12632-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12633-
)
12634-
})?;
12602+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12603+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12604+
})?;
1263512605
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1263612606
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1263712607
let peer_state = &mut *peer_state_lock;
@@ -12743,8 +12713,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1274312713
) -> Result<(), MsgHandleErrInternal> {
1274412714
let per_peer_state = self.per_peer_state.read().unwrap();
1274512715
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12746-
debug_assert!(false);
12747-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12716+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1274812717
})?;
1274912718
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1275012719
let peer_state = &mut *peer_state_lock;
@@ -12801,8 +12770,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1280112770
) -> Result<(), MsgHandleErrInternal> {
1280212771
let per_peer_state = self.per_peer_state.read().unwrap();
1280312772
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12804-
debug_assert!(false);
12805-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12773+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1280612774
})?;
1280712775
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1280812776
let peer_state = &mut *peer_state_lock;
@@ -12847,8 +12815,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1284712815
) -> Result<(), MsgHandleErrInternal> {
1284812816
let per_peer_state = self.per_peer_state.read().unwrap();
1284912817
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12850-
debug_assert!(false);
12851-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12818+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1285212819
})?;
1285312820
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1285412821
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)