Skip to content

Commit 2b181dc

Browse files
committed
cargo fmt
1 parent 6bf2352 commit 2b181dc

File tree

2 files changed

+58
-6
lines changed

2 files changed

+58
-6
lines changed

lightning/src/chain/chainmonitor.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,9 @@ where
565565
};
566566

567567
let has_pending_claims = monitor_state.monitor.has_pending_claims();
568-
if has_pending_claims || get_partition_key(channel_id).is_some_and(|key| key % partition_factor == 0) {
568+
if has_pending_claims
569+
|| get_partition_key(channel_id).is_some_and(|key| key % partition_factor == 0)
570+
{
569571
log_trace!(logger, "Syncing Channel Monitor");
570572
// Even though we don't track monitor updates from chain-sync as pending, we still want
571573
// updates per-channel to be well-ordered so that users don't see a

lightning/src/ln/funding.rs

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,17 @@ impl FundingTemplate {
386386
return Err(FundingContributionError::InvalidSpliceValue);
387387
}
388388
let FundingTemplate { shared_input, min_rbf_feerate, .. } = self;
389-
build_funding_contribution!(value_added, vec![], shared_input, min_rbf_feerate, min_feerate, max_feerate, false, wallet, await)
389+
build_funding_contribution!(
390+
value_added,
391+
vec![],
392+
shared_input,
393+
min_rbf_feerate,
394+
min_feerate,
395+
max_feerate,
396+
false,
397+
wallet,
398+
await
399+
)
390400
}
391401

392402
/// Creates a [`FundingContribution`] for adding funds to a channel using `wallet` to perform
@@ -426,7 +436,17 @@ impl FundingTemplate {
426436
return Err(FundingContributionError::InvalidSpliceValue);
427437
}
428438
let FundingTemplate { shared_input, min_rbf_feerate, .. } = self;
429-
build_funding_contribution!(Amount::ZERO, outputs, shared_input, min_rbf_feerate, min_feerate, max_feerate, false, wallet, await)
439+
build_funding_contribution!(
440+
Amount::ZERO,
441+
outputs,
442+
shared_input,
443+
min_rbf_feerate,
444+
min_feerate,
445+
max_feerate,
446+
false,
447+
wallet,
448+
await
449+
)
430450
}
431451

432452
/// Creates a [`FundingContribution`] for removing funds from a channel using `wallet` to
@@ -467,7 +487,17 @@ impl FundingTemplate {
467487
return Err(FundingContributionError::InvalidSpliceValue);
468488
}
469489
let FundingTemplate { shared_input, min_rbf_feerate, .. } = self;
470-
build_funding_contribution!(value_added, outputs, shared_input, min_rbf_feerate, min_feerate, max_feerate, false, wallet, await)
490+
build_funding_contribution!(
491+
value_added,
492+
outputs,
493+
shared_input,
494+
min_rbf_feerate,
495+
min_feerate,
496+
max_feerate,
497+
false,
498+
wallet,
499+
await
500+
)
471501
}
472502

473503
/// Creates a [`FundingContribution`] for both adding and removing funds from a channel using
@@ -550,10 +580,30 @@ impl FundingTemplate {
550580
return Ok(adjusted);
551581
}
552582
}
553-
build_funding_contribution!(contribution.value_added, contribution.outputs, shared_input, min_rbf_feerate, rbf_feerate, max_feerate, true, wallet, await)
583+
build_funding_contribution!(
584+
contribution.value_added,
585+
contribution.outputs,
586+
shared_input,
587+
min_rbf_feerate,
588+
rbf_feerate,
589+
max_feerate,
590+
true,
591+
wallet,
592+
await
593+
)
554594
},
555595
None => {
556-
build_funding_contribution!(Amount::ZERO, vec![], shared_input, min_rbf_feerate, rbf_feerate, max_feerate, true, wallet, await)
596+
build_funding_contribution!(
597+
Amount::ZERO,
598+
vec![],
599+
shared_input,
600+
min_rbf_feerate,
601+
rbf_feerate,
602+
max_feerate,
603+
true,
604+
wallet,
605+
await
606+
)
557607
},
558608
}
559609
}

0 commit comments

Comments
 (0)