Skip to content

Use test/_test_utils to enable single-threaded debug assertions#1964

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
arik-so merged 2 commits into from
Jan 19, 2023
Merged

Use test/_test_utils to enable single-threaded debug assertions #1964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
358d980
Always set `_test_utils` when building lightning for some tests
TheBlueMatt Jan 17, 2023
7a9bea1
Use `test`/`_test_utils` to enable single-threaded debug assertions
TheBlueMatt Jan 17, 2023
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
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down
1 change: 1 addition & 0 deletions lightning-block-sync/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }
1 change: 1 addition & 0 deletions lightning-net-tokio/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
12 changes: 6 additions & 6 deletions lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
let remote_addr = get_addr_from_stream(&stream);
let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
#[cfg(debug_assertions)]
#[cfg(test)]
let last_us = Arc::clone(&us);

let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
// socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
// keep too many wakers around, this makes sense. The race should be rare (we do
// some work after shutdown()) and an error would be a major memory leak.
#[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
#[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
}
}
}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
let remote_addr = get_addr_from_stream(&stream);
let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
#[cfg(debug_assertions)]
#[cfg(test)]
let last_us = Arc::clone(&us);
let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
// socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
// keep too many wakers around, this makes sense. The race should be rare (we do
// some work after shutdown()) and an error would be a major memory leak.
#[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
#[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
match $internal {
Ok(msg) => Ok(msg),
Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
#[cfg(debug_assertions)]
#[cfg(any(feature = "_test_utils", test))]
{
// In testing, ensure there are no deadlocks where the lock is already held upon
// entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
}

let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
let mut peer_state = peer_state_mutex.lock().unwrap();
peer_state.pending_msg_events.append(&mut msg_events);
}
#[cfg(debug_assertions)]
#[cfg(any(feature = "_test_utils", test))]
{
if let None = per_peer_state.get(&$counterparty_node_id) {
// This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
=> {
assert_eq!(*data, expected_error_str);
if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
}
}
_ => panic!("Unexpected event"),
_ => debug_assert!(false, "Unexpected event"),
}
}
}
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
/// Fails an HTLC backwards to the sender of it to us.
/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
#[cfg(debug_assertions)]
#[cfg(any(feature = "_test_utils", test))]
{
// Ensure that no peer state channel storage lock is not held when calling this
// function.
Expand All@@ -3574,7 +3574,7 @@ where
// this function with any `per_peer_state` peer lock aquired would.
let per_peer_state = self.per_peer_state.read().unwrap();
for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
}
}

Expand Down
, '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" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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('^' + ".*" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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('^' + ".*" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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('^' + ".*" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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('^' + ".*" + '
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down

, '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); }
})();
})();
Use test/_test_utils to enable single-threaded debug assertions by TheBlueMatt · Pull Request #1964 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use test/_test_utils to enable single-threaded debug assertions#1964

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

arik-so
merged 2 commits into

from

Jan 19, 2023
 Merged


Use test/_test_utils to enable single-threaded debug assertions
#1964
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
358d980

Always set `_test_utils` when building lightning for some tests


TheBlueMatt Jan 17, 2023
7a9bea1

Use `test`/`_test_utils` to enable single-threaded debug assertions


TheBlueMatt Jan 17, 2023

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


2 changes: 1 addition & 1 deletion
fuzz/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"]
stdin_fuzz = []

[dependencies]
lightning = { path = "../lightning", features = ["regex", "hashbrown"] }
lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_utils"] }
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
bitcoin = { version = "0.29.0", features = ["secp-lowmemory"] }
hex = "0.3"
Expand Down

1 change: 1 addition & 0 deletions
lightning-block-sync/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,4 +27,5 @@ serde_json = { version = "1.0", optional = true }
chunked_transfer = { version = "1.4", optional = true }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }
tokio = { version = "~1.14", features = [ "macros", "rt" ] }

1 change: 1 addition & 0 deletions
lightning-net-tokio/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,3 +21,4 @@ tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net"

[dev-dependencies]
tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] }
lightning = { version = "0.0.113", path = "../lightning", features = ["_test_utils"] }

12 changes: 6 additions & 6 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);

	let handle_opt = if let Ok(_) = peer_manager.new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr) {
Expand All@@ -307,8 +307,8 @@ pub fn setup_inbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Peer
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand All@@ -335,7 +335,7 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
{
	let remote_addr = get_addr_from_stream(&stream);
	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
	#[cfg(debug_assertions)]
	#[cfg(test)]
	let last_us = Arc::clone(&us);
	let handle_opt = if let Ok(initial_send) = peer_manager.new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 Some(tokio::spawn(async move {
Expand DownExpand Up@@ -381,8 +381,8 @@ pub fn setup_outbound<CMH, RMH, OMH, L, UMH>(peer_manager: Arc<peer_handler::Pee
 // socket shutdown(). Still, as a check during testing, to make sure tokio doesn't
 // keep too many wakers around, this makes sense. The race should be rare (we do
 // some work after shutdown()) and an error would be a major memory leak.
 #[cfg(debug_assertions)]
assert!(Arc::try_unwrap(last_us).is_ok());
 #[cfg(test)]
debug_assert!(Arc::try_unwrap(last_us).is_ok());
 }
 }
	}
Expand Down

16 changes: 8 additions & 8 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1153,12 +1153,12 @@ macro_rules! handle_error {
 match $internal {
 Ok(msg) => Ok(msg),
 Err(MsgHandleErrInternal { err, chan_id, shutdown_finish }) => {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // In testing, ensure there are no deadlocks where the lock is already held upon
 // entering the macro.
assert!($self.pending_events.try_lock().is_ok());
assert!($self.per_peer_state.try_write().is_ok());
debug_assert!($self.pending_events.try_lock().is_ok());
debug_assert!($self.per_peer_state.try_write().is_ok());
 }

 let mut msg_events = Vec::with_capacity(2);
Expand DownExpand Up@@ -1193,7 +1193,7 @@ macro_rules! handle_error {
 let mut peer_state = peer_state_mutex.lock().unwrap();
 peer_state.pending_msg_events.append(&mut msg_events);
 }
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 if let None = per_peer_state.get(&$counterparty_node_id) {
 // This shouldn't occour in tests unless an unkown counterparty_node_id
Expand All@@ -1206,10 +1206,10 @@ macro_rules! handle_error {
 => {
 assert_eq!(*data, expected_error_str);
 if let Some((err_channel_id, _user_channel_id)) = chan_id {
assert_eq!(*channel_id, err_channel_id);
debug_assert_eq!(*channel_id, err_channel_id);
 }
 }
 _ => panic!("Unexpected event"),
 _ => debug_assert!(false, "Unexpected event"),
 }
 }
 }
Expand DownExpand Up@@ -3565,7 +3565,7 @@ where
	/// Fails an HTLC backwards to the sender of it to us.
	/// Note that we do not assume that channels corresponding to failed HTLCs are still available.
	fn fail_htlc_backwards_internal(&self, source: &HTLCSource, payment_hash: &PaymentHash, onion_error: &HTLCFailReason, destination: HTLCDestination) {
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "_test_utils", test))]
 {
 // Ensure that no peer state channel storage lock is not held when calling this
 // function.
Expand All@@ -3574,7 +3574,7 @@ where
 // this function with any `per_peer_state` peer lock aquired would.
 let per_peer_state = self.per_peer_state.read().unwrap();
 for (_, peer) in per_peer_state.iter() {
assert!(peer.try_lock().is_ok());
debug_assert!(peer.try_lock().is_ok());
 }
 }

Expand Down