Skip to content

Commit fb6d61a

Browse files
committed
Rustfmt ChannelManager::internal_commitment_signed
1 parent 7752619 commit fb6d61a

1 file changed

Lines changed: 26 additions & 12 deletions

File tree

lightning/src/ln/channelmanager.rs

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11971,15 +11971,15 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1197111971
}
1197211972
}
1197311973

11974-
#[rustfmt::skip]
11975-
fn internal_commitment_signed(&self, counterparty_node_id: &PublicKey, msg: &msgs::CommitmentSigned) -> Result<(), MsgHandleErrInternal> {
11974+
fn internal_commitment_signed(
11975+
&self, counterparty_node_id: &PublicKey, msg: &msgs::CommitmentSigned,
11976+
) -> Result<(), MsgHandleErrInternal> {
1197611977
let best_block = *self.best_block.read().unwrap();
1197711978
let per_peer_state = self.per_peer_state.read().unwrap();
11978-
let peer_state_mutex = per_peer_state.get(counterparty_node_id)
11979-
.ok_or_else(|| {
11980-
debug_assert!(false);
11981-
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11982-
})?;
11979+
let peer_state_mutex = per_peer_state.get(counterparty_node_id).ok_or_else(|| {
11980+
debug_assert!(false);
11981+
MsgHandleErrInternal::no_such_peer(counterparty_node_id, msg.channel_id)
11982+
})?;
1198311983
let mut peer_state_lock = peer_state_mutex.lock().unwrap();
1198411984
let peer_state = &mut *peer_state_lock;
1198511985
match peer_state.channel_by_id.entry(msg.channel_id) {
@@ -11988,12 +11988,22 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1198811988
let logger = WithChannelContext::from(&self.logger, &chan.context(), None);
1198911989
let funding_txo = chan.funding().get_funding_txo();
1199011990
let (monitor_opt, monitor_update_opt) = try_channel_entry!(
11991-
self, peer_state, chan.commitment_signed(msg, best_block, &self.signer_provider, &self.fee_estimator, &&logger),
11992-
chan_entry);
11991+
self,
11992+
peer_state,
11993+
chan.commitment_signed(
11994+
msg,
11995+
best_block,
11996+
&self.signer_provider,
11997+
&self.fee_estimator,
11998+
&&logger
11999+
),
12000+
chan_entry
12001+
);
1199312002

1199412003
if let Some(chan) = chan.as_funded_mut() {
1199512004
if let Some(monitor) = monitor_opt {
11996-
let monitor_res = self.chain_monitor.watch_channel(monitor.channel_id(), monitor);
12005+
let monitor_res =
12006+
self.chain_monitor.watch_channel(monitor.channel_id(), monitor);
1199712007
if let Ok(persist_state) = monitor_res {
1199812008
if let Some(data) = self.handle_initial_monitor(
1199912009
&mut peer_state.in_flight_monitor_updates,
@@ -12008,7 +12018,8 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1200812018
self.handle_post_monitor_update_chan_resume(data);
1200912019
}
1201012020
} else {
12011-
let logger = WithChannelContext::from(&self.logger, &chan.context, None);
12021+
let logger =
12022+
WithChannelContext::from(&self.logger, &chan.context, None);
1201212023
log_error!(logger, "Persisting initial ChannelMonitor failed, implying the channel ID was duplicated");
1201312024
let msg = "Channel ID was a duplicate";
1201412025
let reason = ClosureReason::ProcessingError { err: msg.to_owned() };
@@ -12033,7 +12044,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
1203312044
}
1203412045
Ok(())
1203512046
},
12036-
hash_map::Entry::Vacant(_) => Err(MsgHandleErrInternal::no_such_channel_for_peer(counterparty_node_id, msg.channel_id))
12047+
hash_map::Entry::Vacant(_) => Err(MsgHandleErrInternal::no_such_channel_for_peer(
12048+
counterparty_node_id,
12049+
msg.channel_id,
12050+
)),
1203712051
}
1203812052
}
1203912053

0 commit comments

Comments
 (0)