Skip to content

Commit 14ca59f

Browse files
committed
Post-rustfmt cleanup
1 parent 2fd5813 commit 14ca59f

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6324,14 +6324,7 @@ where
63246324

63256325
let mut new_events = VecDeque::new();
63266326
let mut failed_forwards = Vec::new();
6327-
let mut phantom_receives: Vec<(
6328-
u64,
6329-
Option<PublicKey>,
6330-
OutPoint,
6331-
ChannelId,
6332-
u128,
6333-
Vec<(PendingHTLCInfo, u64)>,
6334-
)> = Vec::new();
6327+
let mut phantom_receives: Vec<PerSourcePendingForward> = Vec::new();
63356328
{
63366329
let mut forward_htlcs = new_hash_map();
63376330
mem::swap(&mut forward_htlcs, &mut self.forward_htlcs.lock().unwrap());
@@ -10013,15 +10006,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1001310006

1001410007
#[inline]
1001510008
fn forward_htlcs_without_forward_event(
10016-
&self,
10017-
per_source_pending_forwards: &mut [(
10018-
u64,
10019-
Option<PublicKey>,
10020-
OutPoint,
10021-
ChannelId,
10022-
u128,
10023-
Vec<(PendingHTLCInfo, u64)>,
10024-
)],
10009+
&self, per_source_pending_forwards: &mut [PerSourcePendingForward],
1002510010
) -> bool {
1002610011
let mut push_forward_event = false;
1002710012
for &mut (
@@ -10108,7 +10093,11 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1010810093
Some(prev_channel_id),
1010910094
Some(forward_info.payment_hash),
1011010095
);
10111-
log_info!(logger, "Failed to forward incoming HTLC: detected duplicate intercepted payment over short channel id {}", scid);
10096+
log_info!(
10097+
logger,
10098+
"Failed to forward incoming HTLC: detected duplicate intercepted payment over short channel id {}",
10099+
scid
10100+
);
1011210101
let htlc_source =
1011310102
HTLCSource::PreviousHopData(HTLCPreviousHopData {
1011410103
short_channel_id: prev_short_channel_id,

0 commit comments

Comments
 (0)