Introduce check for dangling RAA blockers in test_utils#3504

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
TheBlueMatt merged 2 commits into from
Jan 26, 2025
Merged

Introduce check for dangling RAA blockers in test_utils #3504

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
86a0109
Introduce get_and_clear_pending_raa_blockers
shaavan Jan 3, 2025
45aa824
Introduce RAA Blocker check in Node::drop()
shaavan Jan 3, 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
81 changes: 62 additions & 19 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

reconnect_nodes(reconnect_args);

// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
// `PaymentForwarded` event will finally be released.
let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

// If the A<->B channel was closed before we reload, we'll replay the claim against it on
// reload, causing the `PaymentForwarded` event to get replayed.
let evs = nodes[1].node.get_and_clear_pending_events();
assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
for ev in evs {
if let Event::PaymentForwarded { .. } = ev { }
else {
panic!();
}
}

// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
// `PaymentForwarded` event will finally be released.
let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

// If the A<->B channel was closed before we reload, we'll replay the claim against it on
// reload, causing the `PaymentForwarded` event to get replayed.
let evs = nodes[1].node.get_and_clear_pending_events();
assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
for ev in evs {
if let Event::PaymentForwarded { .. } = ev { }
else {
panic!();
}
}

if !close_chans_before_reload || close_only_a {
// Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
// will fly, removing the payment preimage from it.
check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

create_announced_chan_between_nodes(&nodes, 0, 1);
create_announced_chan_between_nodes(&nodes, 1, 2);
let node_a_id = nodes[0].node.get_our_node_id();
let node_c_id = nodes[2].node.get_our_node_id();

let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

// Route a payment from A, through B, to C, then claim it on C. Replay the
// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
if hold_chan_a {
// The first update will be on the A <-> B channel, which we allow to complete.
// The first update will be on the A <-> B channel, which we optionally allow to complete.
chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
}
nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

// With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
// waiting.
nodes[1].node.send_payment_with_route(route, payment_hash_2,
RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
check_added_monitors(&nodes[1], 0);

assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

// ...but once we complete the A<->B channel preimage persistence, the B<->C channel
// unlocks and we send both peers commitment updates.
let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
assert_eq!(msg_events.len(), 2);
check_added_monitors(&nodes[1], 2);

let mut c_update = msg_events.iter()
.filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
.cloned().collect::<Vec<_>>();
let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
if node_id == node_a_id {
Some(updates)
} else {
None
}
} else {
None
};
let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

assert_eq!(a_update.len(), 1);
assert_eq!(c_update.len(), 1);

nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
}
}

Expand Down
23 changes: 23 additions & 0 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
self.pending_outbound_payments.clear_pending_payments()
}

#[cfg(any(test, feature = "_test_utils"))]
pub(crate) fn get_and_clear_pending_raa_blockers(
&self,
) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
let per_peer_state = self.per_peer_state.read().unwrap();
let mut pending_blockers = Vec::new();

for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
let mut peer_state = peer_state_mutex.lock().unwrap();

for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
// Only collect the non-empty actions into `pending_blockers`.
if !actions.is_empty() {
pending_blockers.push((chan_id.clone(), actions.clone()));

@TheBlueMattTheBlueMattJan 26, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.

@shaavanshaavanJan 28, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!
Will address it in the second part of #3381 solution

}
}

peer_state.actions_blocking_raa_monitor_updates.clear();
}

pending_blockers
}

/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
/// [`Event`] being handled) completes, this should be called to restore the channel to normal
/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down
5 changes: 5 additions & 0 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
}

let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
if !raa_blockers.is_empty() {
panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
}

// Check that if we serialize the network graph, we can deserialize it again.
let network_graph = {
let mut w = test_utils::TestVecWriter(Vec::new());
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" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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('^' + ".*" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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('^' + ".*" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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('^' + ".*" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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('^' + ".*" + '

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
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); }
})();
})();

Skip to content
Introduce check for dangling RAA blockers in test_utils#3504

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

TheBlueMatt
merged 2 commits into

from

Jan 26, 2025
 Merged


Introduce check for dangling RAA blockers in test_utils
#3504
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
86a0109

Introduce get_and_clear_pending_raa_blockers


shaavan Jan 3, 2025
45aa824

Introduce RAA Blocker check in Node::drop()


shaavan Jan 3, 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


81 changes: 62 additions & 19 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
use crate::chain::transaction::OutPoint;
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, PaymentPurpose, ClosureReason, HTLCDestination};
use crate::ln::channelmanager::{RAACommitmentOrder, PaymentSendFailure, PaymentId, RecipientOnionFields};
use crate::ln::channelmanager::{PaymentId, PaymentSendFailure, RAACommitmentOrder, RecipientOnionFields};
use crate::ln::channel::AnnouncementSigsState;
use crate::ln::msgs;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -3312,22 +3312,25 @@ fn do_test_durable_preimages_on_closed_channel(close_chans_before_reload: bool,

 reconnect_nodes(reconnect_args);

 // Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
 // `PaymentForwarded` event will finally be released.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

 // If the A<->B channel was closed before we reload, we'll replay the claim against it on
 // reload, causing the `PaymentForwarded` event to get replayed.
 let evs = nodes[1].node.get_and_clear_pending_events();
 assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
 for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	// Once the blocked `ChannelMonitorUpdate` *finally* completes, the pending
	// `PaymentForwarded` event will finally be released.
	let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
	nodes[1].chain_monitor.chain_monitor.force_channel_monitor_updated(outpoint, ab_update_id);

	// If the A<->B channel was closed before we reload, we'll replay the claim against it on
	// reload, causing the `PaymentForwarded` event to get replayed.
	let evs = nodes[1].node.get_and_clear_pending_events();
	assert_eq!(evs.len(), if close_chans_before_reload { 2 } else { 1 });
	for ev in evs {
 if let Event::PaymentForwarded { .. } = ev { }
 else {
 panic!();
 }
	}

	if !close_chans_before_reload || close_only_a {
 // Once we call `process_pending_events` the final `ChannelMonitor` for the B<->C channel
 // will fly, removing the payment preimage from it.
 check_added_monitors(&nodes[1], 1);
Expand DownExpand Up@@ -3548,8 +3551,11 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);

	create_announced_chan_between_nodes(&nodes, 0, 1);
	create_announced_chan_between_nodes(&nodes, 1, 2);
	let node_a_id = nodes[0].node.get_our_node_id();
	let node_c_id = nodes[2].node.get_our_node_id();

	let chan_id_ab = create_announced_chan_between_nodes(&nodes, 0, 1).2;
	let _chan_id_bc = create_announced_chan_between_nodes(&nodes, 1, 2).2;

	// Route a payment from A, through B, to C, then claim it on C. Replay the
	// `update_fulfill_htlc` twice on B to check that B doesn't hang.
Expand All@@ -3561,7 +3567,7 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {

	let cs_updates = get_htlc_update_msgs(&nodes[2], &nodes[1].node.get_our_node_id());
	if hold_chan_a {
 // The first update will be on the A <-> B channel, which we allow to complete.
 // The first update will be on the A <-> B channel, which we optionally allow to complete.
 chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
	}
	nodes[1].node.handle_update_fulfill_htlc(nodes[2].node.get_our_node_id(), &cs_updates.update_fulfill_htlcs[0]);
Expand All@@ -3588,14 +3594,51 @@ fn do_test_glacial_peer_cant_hang(hold_chan_a: bool) {
 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 let (route, payment_hash_2, _, payment_secret_2) = get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);
 let (route, payment_hash_2, payment_preimage_2, payment_secret_2) =
 get_route_and_payment_hash!(&nodes[1], nodes[2], 1_000_000);

 // With the A<->B preimage persistence not yet complete, the B<->C channel is stuck
 // waiting.
 nodes[1].node.send_payment_with_route(route, payment_hash_2,
 RecipientOnionFields::secret_only(payment_secret_2), PaymentId(payment_hash_2.0)).unwrap();
 check_added_monitors(&nodes[1], 0);

 assert!(nodes[1].node.get_and_clear_pending_events().is_empty());
 assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());

 // ...but once we complete the A<->B channel preimage persistence, the B<->C channel
 // unlocks and we send both peers commitment updates.
 let (outpoint, ab_update_id, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_id_ab).unwrap().clone();
 assert!(nodes[1].chain_monitor.chain_monitor.channel_monitor_updated(outpoint, ab_update_id).is_ok());

 let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
 assert_eq!(msg_events.len(), 2);
 check_added_monitors(&nodes[1], 2);

 let mut c_update = msg_events.iter()
 .filter(|ev| matches!(ev, MessageSendEvent::UpdateHTLCs { node_id, .. } if *node_id == node_c_id))
 .cloned().collect::<Vec<_>>();
 let a_filtermap = |ev| if let MessageSendEvent::UpdateHTLCs { node_id, updates } = ev {
 if node_id == node_a_id {
 Some(updates)
 } else {
 None
 }
 } else {
 None
 };
 let a_update = msg_events.drain(..).filter_map(|ev| a_filtermap(ev)).collect::<Vec<_>>();

 assert_eq!(a_update.len(), 1);
 assert_eq!(c_update.len(), 1);

 nodes[0].node.handle_update_fulfill_htlc(nodes[1].node.get_our_node_id(), &a_update[0].update_fulfill_htlcs[0]);
 commitment_signed_dance!(nodes[0], nodes[1], a_update[0].commitment_signed, false);
 expect_payment_sent(&nodes[0], payment_preimage, None, true, true);
 expect_payment_forwarded!(nodes[1], nodes[0], nodes[2], Some(1000), false, false);

 pass_along_path(&nodes[1], &[&nodes[2]], 1_000_000, payment_hash_2, Some(payment_secret_2), c_update.pop().unwrap(), true, None);
 claim_payment(&nodes[1], &[&nodes[2]], payment_preimage_2);
	}
}

Expand Down

23 changes: 23 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10667,6 +10667,29 @@ where
 self.pending_outbound_payments.clear_pending_payments()
	}

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) fn get_and_clear_pending_raa_blockers(
 &self,
	) -> Vec<(ChannelId, Vec<RAAMonitorUpdateBlockingAction>)> {
 let per_peer_state = self.per_peer_state.read().unwrap();
 let mut pending_blockers = Vec::new();

 for (_peer_pubkey, peer_state_mutex) in per_peer_state.iter() {
 let mut peer_state = peer_state_mutex.lock().unwrap();

 for (chan_id, actions) in peer_state.actions_blocking_raa_monitor_updates.iter() {
 // Only collect the non-empty actions into `pending_blockers`.
 if !actions.is_empty() {
 pending_blockers.push((chan_id.clone(), actions.clone()));
@TheBlueMattTheBlueMattJan 26, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no reason to clone here - we're about to wipe the map, so we could instead drain() and skip the clones.
@shaavanshaavanJan 28, 2025

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! Thanks for the pointer!

Will address it in the second part of #3381 solution
 }
 }

 peer_state.actions_blocking_raa_monitor_updates.clear();
 }

 pending_blockers
	}

	/// When something which was blocking a channel from updating its [`ChannelMonitor`] (e.g. an
	/// [`Event`] being handled) completes, this should be called to restore the channel to normal
	/// operation. It will double-check that nothing *else* is also blocking the same channel from
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -652,6 +652,11 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 panic!("Had {} excess added monitors on node {}", added_monitors.len(), self.logger.id);
 }

 let raa_blockers = self.node.get_and_clear_pending_raa_blockers();
 if !raa_blockers.is_empty() {
 panic!( "Had excess RAA blockers on node {}: {:?}", self.logger.id, raa_blockers);
 }

 // Check that if we serialize the network graph, we can deserialize it again.
 let network_graph = {
 let mut w = test_utils::TestVecWriter(Vec::new());
Expand Down