Skip to content

Commit 75bf42f

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent 27f6e06 commit 75bf42f

1 file changed

Lines changed: 58 additions & 91 deletions

File tree

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

1085010851
let per_peer_state = self.per_peer_state.read().unwrap();
1085110852
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10852-
debug_assert!(false);
10853-
MsgHandleErrInternal::no_such_peer(
10853+
MsgHandleErrInternal::unreachable_no_such_peer(
1085410854
counterparty_node_id,
1085510855
common_fields.temporary_channel_id,
1085610856
)
@@ -10920,11 +10920,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1092010920
// likely to be lost on restart!
1092110921
let (value, output_script, user_id) = {
1092210922
let per_peer_state = self.per_peer_state.read().unwrap();
10923-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
10924-
.ok_or_else(|| {
10925-
debug_assert!(false);
10926-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.common_fields.temporary_channel_id)
10927-
})?;
10923+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10924+
MsgHandleErrInternal::unreachable_no_such_peer(
10925+
counterparty_node_id,
10926+
msg.common_fields.temporary_channel_id,
10927+
)
10928+
})?;
1092810929
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1092910930
let peer_state = &mut *peer_state_lock;
1093010931
match peer_state.channel_by_id.entry(msg.common_fields.temporary_channel_id) {
@@ -10965,8 +10966,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1096510966

1096610967
let per_peer_state = self.per_peer_state.read().unwrap();
1096710968
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10968-
debug_assert!(false);
10969-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.temporary_channel_id)
10969+
MsgHandleErrInternal::unreachable_no_such_peer(
10970+
counterparty_node_id,
10971+
msg.temporary_channel_id,
10972+
)
1097010973
})?;
1097110974

1097210975
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -11160,11 +11163,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1116011163
#[rustfmt::skip]
1116111164
fn internal_peer_storage(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorage) -> Result<(), MsgHandleErrInternal> {
1116211165
let per_peer_state = self.per_peer_state.read().unwrap();
11163-
let peer_state_mutex = per_peer_state.get(&counterparty_node_id)
11164-
.ok_or_else(|| {
11165-
debug_assert!(false);
11166-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11167-
})?;
11166+
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11167+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11168+
})?;
1116811169

1116911170
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1117011171
let peer_state = &mut *peer_state_lock;
@@ -11198,11 +11199,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1119811199
fn internal_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1119911200
let best_block = *self.best_block.read().unwrap();
1120011201
let per_peer_state = self.per_peer_state.read().unwrap();
11201-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11202-
.ok_or_else(|| {
11203-
debug_assert!(false);
11204-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11205-
})?;
11202+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11203+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11204+
})?;
1120611205

1120711206
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1120811207
let peer_state = &mut *peer_state_lock;
@@ -11255,8 +11254,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1125511254
) -> Result<(), MsgHandleErrInternal> {
1125611255
let per_peer_state = self.per_peer_state.read().unwrap();
1125711256
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11258-
debug_assert!(false);
11259-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
11257+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
1126011258
})?;
1126111259
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1126211260
let peer_state = &mut *peer_state_lock;
@@ -11340,8 +11338,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1134011338
) -> Result<NotifyOption, MsgHandleErrInternal> {
1134111339
let per_peer_state = self.per_peer_state.read().unwrap();
1134211340
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11343-
debug_assert!(false);
11344-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id)
11341+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, msg.channel_id)
1134511342
})?;
1134611343
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1134711344
let peer_state = &mut *peer_state_lock;
@@ -11462,8 +11459,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1146211459
let (result, holding_cell_res) = {
1146311460
let per_peer_state = self.per_peer_state.read().unwrap();
1146411461
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11465-
debug_assert!(false);
11466-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11462+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1146711463
})?;
1146811464
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1146911465
let peer_state = &mut *peer_state_lock;
@@ -11567,8 +11563,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1156711563
let (result, holding_cell_res) = {
1156811564
let per_peer_state = self.per_peer_state.read().unwrap();
1156911565
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11570-
debug_assert!(false);
11571-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11566+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1157211567
})?;
1157311568
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1157411569
let peer_state = &mut *peer_state_lock;
@@ -11633,11 +11628,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1163311628
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1163411629
// closing a channel), so any changes are likely to be lost on restart!
1163511630
let per_peer_state = self.per_peer_state.read().unwrap();
11636-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11637-
.ok_or_else(|| {
11638-
debug_assert!(false);
11639-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11640-
})?;
11631+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11632+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11633+
})?;
1164111634
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1164211635
let peer_state = &mut *peer_state_lock;
1164311636
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11699,8 +11692,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1169911692
{
1170011693
let per_peer_state = self.per_peer_state.read().unwrap();
1170111694
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11702-
debug_assert!(false);
11703-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11695+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1170411696
})?;
1170511697
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1170611698
let peer_state = &mut *peer_state_lock;
@@ -11803,8 +11795,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1180311795
) -> Result<(), MsgHandleErrInternal> {
1180411796
let per_peer_state = self.per_peer_state.read().unwrap();
1180511797
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11806-
debug_assert!(false);
11807-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11798+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1180811799
})?;
1180911800
let logger;
1181011801
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -11906,11 +11897,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1190611897
// closing a channel), so any changes are likely to be lost on restart!
1190711898

1190811899
let per_peer_state = self.per_peer_state.read().unwrap();
11909-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11910-
.ok_or_else(|| {
11911-
debug_assert!(false);
11912-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11913-
})?;
11900+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11901+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11902+
})?;
1191411903
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1191511904
let peer_state = &mut *peer_state_lock;
1191611905
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11935,8 +11924,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1193511924
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1193611925
let per_peer_state = self.per_peer_state.read().unwrap();
1193711926
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11938-
debug_assert!(false);
11939-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11927+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1194011928
})?;
1194111929
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1194211930
let peer_state = &mut *peer_state_lock;
@@ -12017,11 +12005,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1201712005
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1201812006
// closing a channel), so any changes are likely to be lost on restart!
1201912007
let per_peer_state = self.per_peer_state.read().unwrap();
12020-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12021-
.ok_or_else(|| {
12022-
debug_assert!(false);
12023-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12024-
})?;
12008+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12009+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12010+
})?;
1202512011
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1202612012
let peer_state = &mut *peer_state_lock;
1202712013
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12043,11 +12029,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1204312029
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1204412030
// closing a channel), so any changes are likely to be lost on restart!
1204512031
let per_peer_state = self.per_peer_state.read().unwrap();
12046-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12047-
.ok_or_else(|| {
12048-
debug_assert!(false);
12049-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12050-
})?;
12032+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12033+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12034+
})?;
1205112035
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1205212036
let peer_state = &mut *peer_state_lock;
1205312037
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12074,8 +12058,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1207412058
let best_block = *self.best_block.read().unwrap();
1207512059
let per_peer_state = self.per_peer_state.read().unwrap();
1207612060
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12077-
debug_assert!(false);
12078-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12061+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1207912062
})?;
1208012063
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1208112064
let peer_state = &mut *peer_state_lock;
@@ -12151,11 +12134,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1215112134
#[rustfmt::skip]
1215212135
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1215312136
let per_peer_state = self.per_peer_state.read().unwrap();
12154-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12155-
.ok_or_else(|| {
12156-
debug_assert!(false);
12157-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12158-
})?;
12137+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12138+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12139+
})?;
1215912140
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1216012141
let peer_state = &mut *peer_state_lock;
1216112142
match peer_state.channel_by_id.entry(channel_id) {
@@ -12293,11 +12274,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1229312274
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1229412275
let (htlcs_to_fail, static_invoices) = {
1229512276
let per_peer_state = self.per_peer_state.read().unwrap();
12296-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12297-
.ok_or_else(|| {
12298-
debug_assert!(false);
12299-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12300-
}).map(|mtx| mtx.lock().unwrap())?;
12277+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12278+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12279+
}).map(|mtx| mtx.lock().unwrap())?;
1230112280
let peer_state = &mut *peer_state_lock;
1230212281
match peer_state.channel_by_id.entry(msg.channel_id) {
1230312282
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12346,11 +12325,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1234612325
#[rustfmt::skip]
1234712326
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1234812327
let per_peer_state = self.per_peer_state.read().unwrap();
12349-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12350-
.ok_or_else(|| {
12351-
debug_assert!(false);
12352-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12353-
})?;
12328+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12329+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12330+
})?;
1235412331
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1235512332
let peer_state = &mut *peer_state_lock;
1235612333
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12372,9 +12349,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1237212349
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1237312350
let per_peer_state = self.per_peer_state.read().unwrap();
1237412351
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12375-
debug_assert!(false);
12376-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12377-
)
12352+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1237812353
})?;
1237912354
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1238012355
let peer_state = &mut *peer_state_lock;
@@ -12427,11 +12402,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1242712402
#[rustfmt::skip]
1242812403
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1242912404
let per_peer_state = self.per_peer_state.read().unwrap();
12430-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12431-
.ok_or_else(|| {
12432-
debug_assert!(false);
12433-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12434-
})?;
12405+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12406+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12407+
})?;
1243512408
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1243612409
let peer_state = &mut *peer_state_lock;
1243712410
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12526,12 +12499,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1252612499
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1252712500
let per_peer_state = self.per_peer_state.read().unwrap();
1252812501

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-
)
12534-
})?;
12502+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12503+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12504+
})?;
1253512505
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1253612506
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1253712507
let peer_state = &mut *peer_state_lock;
@@ -12643,8 +12613,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1264312613
) -> Result<(), MsgHandleErrInternal> {
1264412614
let per_peer_state = self.per_peer_state.read().unwrap();
1264512615
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12646-
debug_assert!(false);
12647-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12616+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1264812617
})?;
1264912618
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1265012619
let peer_state = &mut *peer_state_lock;
@@ -12701,8 +12670,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1270112670
) -> Result<(), MsgHandleErrInternal> {
1270212671
let per_peer_state = self.per_peer_state.read().unwrap();
1270312672
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12704-
debug_assert!(false);
12705-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12673+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1270612674
})?;
1270712675
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1270812676
let peer_state = &mut *peer_state_lock;
@@ -12747,8 +12715,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1274712715
) -> Result<(), MsgHandleErrInternal> {
1274812716
let per_peer_state = self.per_peer_state.read().unwrap();
1274912717
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12750-
debug_assert!(false);
12751-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12718+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1275212719
})?;
1275312720
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1275412721
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)