Remove low-hanging fruit `rustfmt::skip`s in `ChannelManager` by valentinewallace · Pull Request #3844 · lightningdevkit/rust-lightning

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace · 2025-06-10T22:09:58Z

After #3767 landed, there were a bunch of rustfmt::skips added to ChannelManager that could easily be removed.

Here we pick some of that low-hanging fruit by removing the skips for methods that are less than ~5 lines long.

We also remove skips from all cfg(async_payments) code since as the feature owner I know that's safe from unwanted rebase conflicts.

ldk-reviews-bot · 2025-06-10T22:10:01Z

👋 Thanks for assigning @joostjager as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

codecov · 2025-06-10T22:18:49Z

Codecov Report

Attention: Patch coverage is 78.04154% with 74 lines in your changes missing coverage. Please review.

Project coverage is 89.83%. Comparing base (e797180) to head (1532913).
Report is 4 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channelmanager.rs	78.04%	66 Missing and 8 partials ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3844 +/- ##
==========================================
- Coverage 89.87% 89.83% -0.05% 
==========================================
Files 162 162 Lines 130214 130415 +201 Branches 130214 130415 +201 ==========================================
+ Hits 117034 117159 +125 - Misses 10486 10553 +67 - Partials 2694 2703 +9

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

rustfmt::skips were added recently all over channelmanager in order for formatting to be enforced for all new code added to the file. Here we remove a bunch of those skips that aren't necessary because the methods that are skipped are so short. Does not include cfg(splicing) code. Here we just remove the rustfmt skips, in the next commit we'll clean up the code that rustfmt made too vertical.

In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

joostjager · 2025-06-11T10:08:03Z

- funding_transaction,
- )
+ let temporary_chan = &[(&temporary_channel_id, &counterparty_node_id)];
+ self.batch_funding_transaction_generated(temporary_chan, funding_transaction)


I don't think this change is necessary, but no objection either.

joostjager · 2025-06-11T10:09:26Z

 );

+// (src_channel_id, src_counterparty_node_id, src_funding_outpoint, src_chan_id, src_user_chan_id)
+type PerSourcePendingForward =


Shouldn't this just be a struct now? Pre-existing though.

joostjager · 2025-06-11T10:13:49Z

- self.abandon_payment_with_reason(payment_id, PaymentFailureReason::BlindedPathCreationFailed);
- res = Err(Bolt12PaymentError::BlindedPathCreationFailed);
- return NotifyOption::DoPersist
+ let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(


Could be risk-reducing to keep every change that isn't strictly rustfmt in a separate commit.

tnull

Going ahead landing this.

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

valentinewallace requested a review from joostjager June 10, 2025 22:10

valentinewallace added 3 commits June 10, 2025 18:22

Fix rustfmt'd short ChannelManager methods
89db55b
In the previous commit we formatted a bunch of short methods. Here we clean up the default formatting that rustfmt applied by extracting code into variables.

Remove rustfmt skips from ChannelManager async payments code
1532913
This code is not at risk of unwanted rebase conflicts, so the skips can safely be removed. Also did one minor extraction into a variable.

valentinewallace force-pushed the 2025-06-fmt-chanmgr-more branch from f752e7f to 1532913Compare June 10, 2025 22:25

tnull approved these changes Jun 11, 2025
View reviewed changes

joostjager added the rustfmt label Jun 11, 2025

joostjager approved these changes Jun 11, 2025
View reviewed changes

tnull approved these changes Jun 11, 2025
View reviewed changes

tnull merged commit b8673f3 into lightningdevkit:mainJun 11, 2025

This was referenced Jun 12, 2025
Remove low-hanging fruit rustfmt::skips in ChannelManager pt. 2 #3850
Merged
Remove low-hanging fruit rustfmt::skips in Channel #3854
Merged

Uh oh!

Conversation

valentinewallace commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ldk-reviews-bot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecovBot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

valentinewallace commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ldk-reviews-bot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecovBot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

valentinewallace commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ldk-reviews-bot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecovBot commented Jun 10, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

valentinewallace commented Jun 10, 2025•
edited
Loading

ldk-reviews-bot commented Jun 10, 2025•
edited
Loading

codecovBot commented Jun 10, 2025•
edited
Loading

valentinewallace commented Jun 10, 2025•
edited
Loading

ldk-reviews-bot commented Jun 10, 2025•
edited
Loading

codecovBot commented Jun 10, 2025•
edited
Loading

valentinewallace commented Jun 10, 2025•
edited
Loading

ldk-reviews-bot commented Jun 10, 2025•
edited
Loading

codecovBot commented Jun 10, 2025•
edited
Loading

valentinewallace commented Jun 10, 2025•
edited
Loading

ldk-reviews-bot commented Jun 10, 2025•
edited
Loading

codecovBot commented Jun 10, 2025•
edited
Loading