Skip to content

Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 12 commits into from
Jun 12, 2025
Merged

Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d4c6681
Clean up `chain/transaction.rs` tests marginally before rustfmt
TheBlueMatt May 18, 2025
1faaab6
Run `rustfmt` on `chain/transaction.rs`
TheBlueMatt May 18, 2025
4349898
Run rustfmt on `chain/chaininterface.rs`
TheBlueMatt May 18, 2025
6d0c940
Run `rustfmt` on `max_payment_path_len_tests.rs`
TheBlueMatt May 18, 2025
cd135f6
Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it
TheBlueMatt May 18, 2025
1d36d1d
Run `rustfmt` on `chanmon_update_fail_tests.rs`
TheBlueMatt May 18, 2025
dd30a77
Remove some unnecessary `vec`s from `chanmon_update_fail_tests`
TheBlueMatt May 18, 2025
a521e15
Avoid `assert!(a == b)` in `chanmon_update_fail_tests`
TheBlueMatt May 18, 2025
b0de677
Use `node_*_id` variables in chanmon_update_fail_tests
TheBlueMatt May 18, 2025
df1802a
Re-`rustfmt` `chanmon_update_fail_tests`
TheBlueMatt May 18, 2025
8ca43a1
Introduce a fn to fetch the monitor update id in chanmon tests
TheBlueMatt May 18, 2025
b9d0d60
Clean up various overly vertical nonsense in chanmon fail tests
TheBlueMatt May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions lightning/src/chain/chaininterface.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
F::Target: FeeEstimator,
{
/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
pub fn new(fee_estimator: F) -> Self {
LowerBoundedFeeEstimator(fee_estimator)
}

pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
cmp::max(
self.0.get_est_sat_per_1000_weight(confirmation_target),
FEERATE_FLOOR_SATS_PER_KW,
)
cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
}
}

#[cfg(test)]
mod tests {
use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
use super::{
ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
};

struct TestFeeEstimator {
sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
assert_eq!(
fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
FEERATE_FLOOR_SATS_PER_KW
);
}

#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
assert_eq!(
fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
sat_per_kw
);
}
}
31 changes: 15 additions & 16 deletions lightning/src/chain/transaction.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
/// This is not exported to bindings users as the same type is used universally in the C bindings
/// for all outpoints
pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
BitcoinOutPoint {
txid: self.txid,
vout: self.index as u32,
}
BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
use crate::chain::transaction::OutPoint;
use crate::ln::types::ChannelId;

use bitcoin::transaction::Transaction;
use bitcoin::consensus::encode;
use bitcoin::hex::FromHex;
use bitcoin::transaction::Transaction;

#[test]
fn test_channel_id_calculation() {
let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
txid: tx.compute_txid(),
index: 0
}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
txid: tx.compute_txid(),
index: 1
}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
let tx: Transaction =
encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

let txid = tx.compute_txid();

let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests` by TheBlueMatt · Pull Request #3783 · lightningdevkit/rust-lightning · GitHub
Skip to content
Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 12 commits into

from

Jun 12, 2025
 Merged


Run rustfmt on chain/transaction, chain/chaininterface, max_payment_path_len_tests, and chanmon_update_fail_tests#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
d4c6681

Clean up `chain/transaction.rs` tests marginally before rustfmt


TheBlueMatt May 18, 2025
1faaab6

Run `rustfmt` on `chain/transaction.rs`


TheBlueMatt May 18, 2025
4349898

Run rustfmt on `chain/chaininterface.rs`


TheBlueMatt May 18, 2025
6d0c940

Run `rustfmt` on `max_payment_path_len_tests.rs`


TheBlueMatt May 18, 2025
cd135f6

Cleanup `max_payment_path_len_tests` somewhat after `rustfmt`ing it


TheBlueMatt May 18, 2025
1d36d1d

Run `rustfmt` on `chanmon_update_fail_tests.rs`


TheBlueMatt May 18, 2025
dd30a77

Remove some unnecessary `vec`s from `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
a521e15

Avoid `assert!(a == b)` in `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
b0de677

Use `node_*_id` variables in chanmon_update_fail_tests


TheBlueMatt May 18, 2025
df1802a

Re-`rustfmt` `chanmon_update_fail_tests`


TheBlueMatt May 18, 2025
8ca43a1

Introduce a fn to fetch the monitor update id in chanmon tests


TheBlueMatt May 18, 2025
b9d0d60

Clean up various overly vertical nonsense in chanmon fail tests


TheBlueMatt May 18, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 20 additions & 12 deletions
lightning/src/chain/chaininterface.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
///
/// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
/// two.
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
where
	F::Target: FeeEstimator;

impl<F: Deref> LowerBoundedFeeEstimator<F>
where
	F::Target: FeeEstimator,
{
	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
	pub fn new(fee_estimator: F) -> Self {
 LowerBoundedFeeEstimator(fee_estimator)
	}

	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
 cmp::max(
 self.0.get_est_sat_per_1000_weight(confirmation_target),
 FEERATE_FLOOR_SATS_PER_KW,
 )
 cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
	}
}

#[cfg(test)]
mod tests {
	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
	use super::{
 ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
	};

	struct TestFeeEstimator {
 sat_per_kw: u32,
Expand All@@ -225,7 +227,10 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 FEERATE_FLOOR_SATS_PER_KW
 );
	}

	#[test]
Expand All@@ -234,6 +239,9 @@ mod tests {
 let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);

 assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
 assert_eq!(
 fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
 sat_per_kw
 );
	}
}

31 changes: 15 additions & 16 deletions
lightning/src/chain/transaction.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
#![cfg_attr(rustfmt, rustfmt_skip)]

// This file is Copyright its original authors, visible in version control
// history.
//
Expand DownExpand Up@@ -63,10 +61,7 @@ impl OutPoint {
	/// This is not exported to bindings users as the same type is used universally in the C bindings
	/// for all outpoints
	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
 BitcoinOutPoint {
 txid: self.txid,
 vout: self.index as u32,
 }
 BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
	}
}

Expand All@@ -92,20 +87,24 @@ mod tests {
	use crate::chain::transaction::OutPoint;
	use crate::ln::types::ChannelId;

	use bitcoin::transaction::Transaction;
	use bitcoin::consensus::encode;
	use bitcoin::hex::FromHex;
	use bitcoin::transaction::Transaction;

	#[test]
	fn test_channel_id_calculation() {
 let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 0
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
 assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
 txid: tx.compute_txid(),
 index: 1
 }).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
 let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
 let tx: Transaction =
 encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();

 let txid = tx.compute_txid();

 let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
 let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
 assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);

 let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
 let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
 assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
	}
}
Loading