Skip to content

Commit c2a6327

Browse files
wpaulinowpaulino
committed
Inline unreachable debug assertion in MsgHandlErrInternal::no_such_peer
1 parent a9eb571 commit c2a6327

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

1082510826
let per_peer_state = self.per_peer_state.read().unwrap();
1082610827
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10827-
debug_assert!(false);
10828-
MsgHandleErrInternal::no_such_peer(
10828+
MsgHandleErrInternal::unreachable_no_such_peer(
1082910829
counterparty_node_id,
1083010830
common_fields.temporary_channel_id,
1083110831
)
@@ -10895,11 +10895,12 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1089510895
// likely to be lost on restart!
1089610896
let (value, output_script, user_id) = {
1089710897
let per_peer_state = self.per_peer_state.read().unwrap();
10898-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
10899-
.ok_or_else(|| {
10900-
debug_assert!(false);
10901-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.common_fields.temporary_channel_id)
10902-
})?;
10898+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10899+
MsgHandleErrInternal::unreachable_no_such_peer(
10900+
counterparty_node_id,
10901+
msg.common_fields.temporary_channel_id,
10902+
)
10903+
})?;
1090310904
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1090410905
let peer_state = &mut *peer_state_lock;
1090510906
match peer_state.channel_by_id.entry(msg.common_fields.temporary_channel_id) {
@@ -10940,8 +10941,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1094010941

1094110942
let per_peer_state = self.per_peer_state.read().unwrap();
1094210943
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
10943-
debug_assert!(false);
10944-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.temporary_channel_id)
10944+
MsgHandleErrInternal::unreachable_no_such_peer(
10945+
counterparty_node_id,
10946+
msg.temporary_channel_id,
10947+
)
1094510948
})?;
1094610949

1094710950
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -11135,11 +11138,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1113511138
#[rustfmt::skip]
1113611139
fn internal_peer_storage(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorage) -> Result<(), MsgHandleErrInternal> {
1113711140
let per_peer_state = self.per_peer_state.read().unwrap();
11138-
let peer_state_mutex = per_peer_state.get(&counterparty_node_id)
11139-
.ok_or_else(|| {
11140-
debug_assert!(false);
11141-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11142-
})?;
11141+
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11142+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, ChannelId([0; 32]))
11143+
})?;
1114311144

1114411145
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1114511146
let peer_state = &mut *peer_state_lock;
@@ -11173,11 +11174,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1117311174
fn internal_funding_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingSigned) -> Result<(), MsgHandleErrInternal> {
1117411175
let best_block = *self.best_block.read().unwrap();
1117511176
let per_peer_state = self.per_peer_state.read().unwrap();
11176-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11177-
.ok_or_else(|| {
11178-
debug_assert!(false);
11179-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11180-
})?;
11177+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11178+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11179+
})?;
1118111180

1118211181
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1118311182
let peer_state = &mut *peer_state_lock;
@@ -11230,8 +11229,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1123011229
) -> Result<(), MsgHandleErrInternal> {
1123111230
let per_peer_state = self.per_peer_state.read().unwrap();
1123211231
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11233-
debug_assert!(false);
11234-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
11232+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
1123511233
})?;
1123611234
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1123711235
let peer_state = &mut *peer_state_lock;
@@ -11315,8 +11313,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1131511313
) -> Result<NotifyOption, MsgHandleErrInternal> {
1131611314
let per_peer_state = self.per_peer_state.read().unwrap();
1131711315
let peer_state_mutex = per_peer_state.get(&counterparty_node_id).ok_or_else(|| {
11318-
debug_assert!(false);
11319-
MsgHandleErrInternal::no_such_peer(&counterparty_node_id, msg.channel_id)
11316+
MsgHandleErrInternal::unreachable_no_such_peer(&counterparty_node_id, msg.channel_id)
1132011317
})?;
1132111318
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1132211319
let peer_state = &mut *peer_state_lock;
@@ -11437,8 +11434,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1143711434
let (result, holding_cell_res) = {
1143811435
let per_peer_state = self.per_peer_state.read().unwrap();
1143911436
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11440-
debug_assert!(false);
11441-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11437+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1144211438
})?;
1144311439
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1144411440
let peer_state = &mut *peer_state_lock;
@@ -11542,8 +11538,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1154211538
let (result, holding_cell_res) = {
1154311539
let per_peer_state = self.per_peer_state.read().unwrap();
1154411540
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11545-
debug_assert!(false);
11546-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11541+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1154711542
})?;
1154811543
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1154911544
let peer_state = &mut *peer_state_lock;
@@ -11608,11 +11603,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1160811603
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1160911604
// closing a channel), so any changes are likely to be lost on restart!
1161011605
let per_peer_state = self.per_peer_state.read().unwrap();
11611-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11612-
.ok_or_else(|| {
11613-
debug_assert!(false);
11614-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11615-
})?;
11606+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11607+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11608+
})?;
1161611609
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1161711610
let peer_state = &mut *peer_state_lock;
1161811611
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11674,8 +11667,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1167411667
{
1167511668
let per_peer_state = self.per_peer_state.read().unwrap();
1167611669
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11677-
debug_assert!(false);
11678-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11670+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1167911671
})?;
1168011672
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1168111673
let peer_state = &mut *peer_state_lock;
@@ -11778,8 +11770,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1177811770
) -> Result<(), MsgHandleErrInternal> {
1177911771
let per_peer_state = self.per_peer_state.read().unwrap();
1178011772
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11781-
debug_assert!(false);
11782-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11773+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1178311774
})?;
1178411775
let logger;
1178511776
let tx_err: Option<(_, Result<Infallible, _>)> = {
@@ -11881,11 +11872,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1188111872
// closing a channel), so any changes are likely to be lost on restart!
1188211873

1188311874
let per_peer_state = self.per_peer_state.read().unwrap();
11884-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11885-
.ok_or_else(|| {
11886-
debug_assert!(false);
11887-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11888-
})?;
11875+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11876+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11877+
})?;
1188911878
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1189011879
let peer_state = &mut *peer_state_lock;
1189111880
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11910,8 +11899,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1191011899
let (htlc_source, forwarded_htlc_value, skimmed_fee_msat, send_timestamp) = {
1191111900
let per_peer_state = self.per_peer_state.read().unwrap();
1191211901
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11913-
debug_assert!(false);
11914-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11902+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1191511903
})?;
1191611904
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1191711905
let peer_state = &mut *peer_state_lock;
@@ -11992,11 +11980,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1199211980
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1199311981
// closing a channel), so any changes are likely to be lost on restart!
1199411982
let per_peer_state = self.per_peer_state.read().unwrap();
11995-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11996-
.ok_or_else(|| {
11997-
debug_assert!(false);
11998-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11999-
})?;
11983+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11984+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
11985+
})?;
1200011986
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1200111987
let peer_state = &mut *peer_state_lock;
1200211988
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12018,11 +12004,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1201812004
// Note that the ChannelManager is NOT re-persisted on disk after this (unless we error
1201912005
// closing a channel), so any changes are likely to be lost on restart!
1202012006
let per_peer_state = self.per_peer_state.read().unwrap();
12021-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12022-
.ok_or_else(|| {
12023-
debug_assert!(false);
12024-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12025-
})?;
12007+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12008+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12009+
})?;
1202612010
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1202712011
let peer_state = &mut *peer_state_lock;
1202812012
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12049,8 +12033,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1204912033
let best_block = *self.best_block.read().unwrap();
1205012034
let per_peer_state = self.per_peer_state.read().unwrap();
1205112035
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12052-
debug_assert!(false);
12053-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12036+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1205412037
})?;
1205512038
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1205612039
let peer_state = &mut *peer_state_lock;
@@ -12126,11 +12109,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1212612109
#[rustfmt::skip]
1212712110
fn internal_commitment_signed_batch(&self, counterparty_node_id: &PublicKey, channel_id: ChannelId, batch: Vec<msgs::CommitmentSigned>) -> Result<(), MsgHandleErrInternal> {
1212812111
let per_peer_state = self.per_peer_state.read().unwrap();
12129-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12130-
.ok_or_else(|| {
12131-
debug_assert!(false);
12132-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, channel_id)
12133-
})?;
12112+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12113+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, channel_id)
12114+
})?;
1213412115
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1213512116
let peer_state = &mut *peer_state_lock;
1213612117
match peer_state.channel_by_id.entry(channel_id) {
@@ -12268,11 +12249,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1226812249
fn internal_revoke_and_ack(&self, counterparty_node_id: &PublicKey, msg: &msgs::RevokeAndACK) -> Result<(), MsgHandleErrInternal> {
1226912250
let (htlcs_to_fail, static_invoices) = {
1227012251
let per_peer_state = self.per_peer_state.read().unwrap();
12271-
let mut peer_state_lock = per_peer_state.get(counterparty_node_id)
12272-
.ok_or_else(|| {
12273-
debug_assert!(false);
12274-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12275-
}).map(|mtx| mtx.lock().unwrap())?;
12252+
let mut peer_state_lock = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12253+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12254+
}).map(|mtx| mtx.lock().unwrap())?;
1227612255
let peer_state = &mut *peer_state_lock;
1227712256
match peer_state.channel_by_id.entry(msg.channel_id) {
1227812257
hash_map::Entry::Occupied(mut chan_entry) => {
@@ -12321,11 +12300,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1232112300
#[rustfmt::skip]
1232212301
fn internal_update_fee(&self, counterparty_node_id: &PublicKey, msg: &msgs::UpdateFee) -> Result<(), MsgHandleErrInternal> {
1232312302
let per_peer_state = self.per_peer_state.read().unwrap();
12324-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12325-
.ok_or_else(|| {
12326-
debug_assert!(false);
12327-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12328-
})?;
12303+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12304+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12305+
})?;
1232912306
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1233012307
let peer_state = &mut *peer_state_lock;
1233112308
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12347,9 +12324,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1234712324
fn internal_stfu(&self, counterparty_node_id: &PublicKey, msg: &msgs::Stfu) -> Result<bool, MsgHandleErrInternal> {
1234812325
let per_peer_state = self.per_peer_state.read().unwrap();
1234912326
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12350-
debug_assert!(false);
12351-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12352-
)
12327+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1235312328
})?;
1235412329
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1235512330
let peer_state = &mut *peer_state_lock;
@@ -12402,11 +12377,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1240212377
#[rustfmt::skip]
1240312378
fn internal_announcement_signatures(&self, counterparty_node_id: &PublicKey, msg: &msgs::AnnouncementSignatures) -> Result<(), MsgHandleErrInternal> {
1240412379
let per_peer_state = self.per_peer_state.read().unwrap();
12405-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12406-
.ok_or_else(|| {
12407-
debug_assert!(false);
12408-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12409-
})?;
12380+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12381+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12382+
})?;
1241012383
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1241112384
let peer_state = &mut *peer_state_lock;
1241212385
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -12501,12 +12474,9 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1250112474
let (inferred_splice_locked, need_lnd_workaround, holding_cell_res) = {
1250212475
let per_peer_state = self.per_peer_state.read().unwrap();
1250312476

12504-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
12505-
.ok_or_else(|| {
12506-
debug_assert!(false);
12507-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id
12508-
)
12509-
})?;
12477+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12478+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
12479+
})?;
1251012480
let logger = WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), None);
1251112481
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1251212482
let peer_state = &mut *peer_state_lock;
@@ -12618,8 +12588,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1261812588
) -> Result<(), MsgHandleErrInternal> {
1261912589
let per_peer_state = self.per_peer_state.read().unwrap();
1262012590
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12621-
debug_assert!(false);
12622-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12591+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1262312592
})?;
1262412593
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1262512594
let peer_state = &mut *peer_state_lock;
@@ -12676,8 +12645,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1267612645
) -> Result<(), MsgHandleErrInternal> {
1267712646
let per_peer_state = self.per_peer_state.read().unwrap();
1267812647
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12679-
debug_assert!(false);
12680-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12648+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1268112649
})?;
1268212650
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1268312651
let peer_state = &mut *peer_state_lock;
@@ -12722,8 +12690,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1272212690
) -> Result<(), MsgHandleErrInternal> {
1272312691
let per_peer_state = self.per_peer_state.read().unwrap();
1272412692
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
12725-
debug_assert!(false);
12726-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
12693+
MsgHandleErrInternal::unreachable_no_such_peer(counterparty_node_id, msg.channel_id)
1272712694
})?;
1272812695
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1272912696
let peer_state = &mut *peer_state_lock;

0 commit comments

Comments
 (0)