Skip to content

Commit d815b8b

Browse files
committed
Clean up trailing whitespace.
1 parent f321a29 commit d815b8b

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

lightning/src/ln/async_signer_tests.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ fn do_test_payment(masks: &Vec<u32>) {
434434
// TODO: run this with_async_signer once validate_counterparty_revocation supports it.
435435
alice.node.handle_revoke_and_ack(&bob.node.get_our_node_id(), &raa);
436436
check_added_monitors(alice, 1);
437-
437+
438438
with_async_signer(&alice, &bob.node.get_our_node_id(), &channel_id, masks, &|| {
439439
alice.node.handle_commitment_signed(&bob.node.get_our_node_id(), &cu.commitment_signed);
440440
check_added_monitors(alice, 1);
@@ -471,7 +471,7 @@ fn do_test_payment(masks: &Vec<u32>) {
471471
ev => panic!("Expected PaymentClaimed, got {:?}", ev),
472472
}
473473
}
474-
474+
475475
// alice <--[update_fulfill_htlcs]-- bob
476476
// alice <--[commitment_signed]-- bob
477477
{
@@ -512,7 +512,7 @@ fn do_test_payment(masks: &Vec<u32>) {
512512
// TODO: run with async once validate_counterparty_revocation supports it.
513513
bob.node.handle_revoke_and_ack(&alice.node.get_our_node_id(), &raa);
514514
check_added_monitors(bob, 1);
515-
515+
516516
with_async_signer(&bob, &alice.node.get_our_node_id(), &channel_id, masks, &|| {
517517
bob.node.handle_commitment_signed(&alice.node.get_our_node_id(), &cu.commitment_signed);
518518
check_added_monitors(bob, 1);
@@ -739,4 +739,3 @@ fn test_peer_reconnect_srg() {
739739
fn test_peer_reconnect_sgr() {
740740
do_test_payment(&vec![ops::SIGN_COUNTERPARTY_COMMITMENT, ops::GET_PER_COMMITMENT_POINT, ops::RELEASE_COMMITMENT_SECRET]);
741741
}
742-

lightning/src/ln/channel.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
819819
/// If we attempted to release the per-commitment secret for the previous transaction but the
820820
/// signer wasn't ready, then this will be set to `true`.
821821
signer_pending_released_secret: bool,
822-
822+
823823
// pending_update_fee is filled when sending and receiving update_fee.
824824
//
825825
// Because it follows the same commitment flow as HTLCs, `FeeUpdateState` is either `Outbound`
@@ -1287,7 +1287,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
12871287
{
12881288
let transaction_number = self.cur_holder_commitment_transaction_number;
12891289
let signer = self.holder_signer.as_ref();
1290-
1290+
12911291
log_trace!(logger, "Retrieving commitment point for {} transaction number {}", self.channel_id(), transaction_number);
12921292
self.cur_holder_commitment_point = match signer.get_per_commitment_point(transaction_number, &self.secp_ctx) {
12931293
Ok(point) => {
@@ -2215,7 +2215,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
22152215
log_trace!(logger, "Counterparty commitment signature ready for funding_created message: clearing signer_pending_funding");
22162216
self.signer_pending_funding = false;
22172217
}
2218-
2218+
22192219
Some(msgs::FundingCreated {
22202220
temporary_channel_id: self.temporary_channel_id.unwrap(),
22212221
funding_txid: self.channel_transaction_parameters.funding_outpoint.as_ref().unwrap().txid,
@@ -3342,7 +3342,7 @@ impl<SP: Deref> Channel<SP> where
33423342

33433343
self.context.cur_holder_commitment_transaction_number -= 1;
33443344
self.context.update_holder_per_commitment(logger);
3345-
3345+
33463346
// Note that if we need_commitment & !AwaitingRemoteRevoke we'll call
33473347
// build_commitment_no_status_check() next which will reset this to RAAFirst.
33483348
log_debug!(logger, "setting resend_order to CommitmentFirst");
@@ -4157,7 +4157,7 @@ impl<SP: Deref> Channel<SP> where
41574157

41584158
(cu, raa)
41594159
}
4160-
4160+
41614161
RAACommitmentOrder::RevokeAndACKFirst => {
41624162
let raa = if self.context.signer_pending_revoke_and_ack {
41634163
log_trace!(logger, "Attempting to generate pending RAA...");
@@ -4462,7 +4462,7 @@ impl<SP: Deref> Channel<SP> where
44624462
log_trace!(logger, "Could not generate channel_ready during channel_reestablish; setting signer_pending_channel_ready");
44634463
self.context.signer_pending_channel_ready = true;
44644464
}
4465-
4465+
44664466
return Ok(ReestablishResponses {
44674467
channel_ready,
44684468
raa: None, commitment_update: None,
@@ -5240,7 +5240,7 @@ impl<SP: Deref> Channel<SP> where
52405240
// channel_ready.
52415241
let res = self.context.holder_signer.as_ref().get_per_commitment_point(
52425242
INITIAL_COMMITMENT_NUMBER - 1, &self.context.secp_ctx);
5243-
5243+
52445244
if let Ok(next_per_commitment_point) = res {
52455245
Some(msgs::ChannelReady {
52465246
channel_id: self.context.channel_id,
@@ -6270,7 +6270,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
62706270
signer_pending_channel_ready: false,
62716271
signer_pending_commitment_point: false,
62726272
signer_pending_released_secret: false,
6273-
6273+
62746274
#[cfg(debug_assertions)]
62756275
holder_max_commitment_tx_output: Mutex::new((channel_value_satoshis * 1000 - push_msat, push_msat)),
62766276
#[cfg(debug_assertions)]

lightning/src/ln/channelmanager.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2393,7 +2393,7 @@ where
23932393
log_trace!(self.logger, "Awaiting signer for open_channel, setting signer_pending_open_channel");
23942394
channel.signer_pending_open_channel = true;
23952395
}
2396-
2396+
23972397
let temporary_channel_id = channel.context.channel_id();
23982398
match peer_state.channel_by_id.entry(temporary_channel_id) {
23992399
hash_map::Entry::Occupied(_) => {
@@ -2412,7 +2412,7 @@ where
24122412
msg,
24132413
});
24142414
};
2415-
2415+
24162416
Ok(temporary_channel_id)
24172417
}
24182418

@@ -5676,7 +5676,7 @@ where
56765676
for msg in pending_msg_events.iter() {
56775677
log_debug!(self.logger, " {:?}", msg);
56785678
}
5679-
5679+
56805680
htlc_forwards
56815681
}
56825682

0 commit comments

Comments
 (0)