Hold PeerState in an RwLock rather than a Mutex#2968

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

Closed
tnull wants to merge 6 commits into from
Closed

Hold PeerState in an RwLock rather than a Mutex#2968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1ae10b
Hold `PeerState` in an `RwLock` rather than a `Mutex`
tnull Mar 26, 2024
6a9a01a
Have `list_channels*` methods only acquire an `RwLockReadGuard`
tnull Mar 26, 2024
abdd6fb
Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`
tnull Mar 27, 2024
4209c9f
Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`
tnull Mar 27, 2024
aa4abb2
Have `get_relevant_txids` only acquire an `RwLockReadGuard`
tnull Mar 27, 2024
cf2d418
Have `ChannelManager::write` method only acquire an `RwLockReadGuard`
tnull Mar 27, 2024
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
312 changes: 156 additions & 156 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

let per_peer_state = self.node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

let mut channel_keys_id = None;
if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
{
$per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
$peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
}
}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
let peer_state = node.node.per_peer_state.read().unwrap();
for (_, peer_mutex) in peer_state.iter() {
let peer = peer_mutex.lock().unwrap();
for (_, peer_rwlock) in peer_state.iter() {
let peer = peer_rwlock.read().unwrap();
if peer.is_connected { return true; }
}
false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
let mut number_of_msg_events = 0;
for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
let peer_state = peer_state_mutex.lock().unwrap();
for (cp_id, peer_state) in node_a_per_peer_state.iter() {
let peer_state = peer_state.write().unwrap();
let cp_pending_msg_events = &peer_state.pending_msg_events;
number_of_msg_events += cp_pending_msg_events.len();
if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
let (base_fee, prop_fee) = {
let per_peer_state = $node.node.per_peer_state.read().unwrap();
let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
.unwrap().lock().unwrap();
.unwrap().write().unwrap();
let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
if let Some(prev_config) = channel.context().prev_config() {
(prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
let peer_state_lock = $node.node.per_peer_state.read().unwrap();
let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
let chan = chan_lock.channel_by_id.get(&$channel_id).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand Down
34 changes: 17 additions & 17 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
// needed to sign the new commitment tx and (2) sign the new commitment tx.
let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
};
let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

let res = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
// needed to sign the new commitment tx and (2) sign the new commitment tx.
let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
};
let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

let res = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
// The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
// well, so HTLCs at exactly the dust limit will not be included in commitment txn.
nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
.unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
} else { 3000000 };

let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
.unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
// 0th HTLC:
let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
.unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

// Fetch a route in advance as we will be unable to once we're unable to send.
let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
let htlc_minimum_msat: u64;
{
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
.unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

// We route 2 dust-HTLCs between A and B
let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
.unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
let next_per_commitment_point;
{
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let keys = guard.channel_by_id.get_mut(&channel_id).map(
|phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

let funding_created = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
// Once we call `get_funding_created` the channel has a duplicate channel_id as
// another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
// try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
(chan.context().get_dust_buffer_feerate(None) as u64,
chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
let check_outbound_channel_existence = |should_exist: bool| {
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
let check_inbound_channel_existence = |should_exist: bool| {
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
};

Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/onion_route_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

let short_channel_id = channels[1].0.contents.short_channel_id;
let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
.unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
.unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
.context().get_counterparty_htlc_minimum_msat() - 1;
let mut bogus_route = route.clone();
let route_len = bogus_route.paths[0].hops.len();
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
{
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
.unwrap().lock().unwrap();
.unwrap().write().unwrap();
let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
let mut new_config = channel.context().config();
new_config.forwarding_fee_base_msat += 100_000;
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/ln/reorg_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

{
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
assert_eq!(peer_state.channel_by_id.len(), 1);
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

{
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
assert_eq!(peer_state.channel_by_id.len(), 0);
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
}
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

{
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
assert_eq!(peer_state.channel_by_id.len(), 0);
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

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

Skip to content
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down

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

Skip to content
Hold PeerState in an RwLock rather than a Mutex#2968

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

 Closed

tnull
wants to merge
6
commits into

from

 Closed


Hold PeerState in an RwLock rather than a Mutex#2968
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f1ae10b

Hold `PeerState` in an `RwLock` rather than a `Mutex`


tnull Mar 26, 2024
6a9a01a

Have `list_channels*` methods only acquire an `RwLockReadGuard`


tnull Mar 26, 2024
abdd6fb

Have `forward_intercepted_htlc` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
4209c9f

Have `compute_inflight_htlcs` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
aa4abb2

Have `get_relevant_txids` only acquire an `RwLockReadGuard`


tnull Mar 27, 2024
cf2d418

Have `ChannelManager::write` method only acquire an `RwLockReadGuard`


tnull Mar 27, 2024

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


312 changes: 156 additions & 156 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -491,7 +491,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);

 let per_peer_state = self.node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(peer_id).unwrap().write().unwrap();

 let mut channel_keys_id = None;
 if let Some(chan) = chan_lock.channel_by_id.get(chan_id).map(|phase| phase.context()) {
Expand DownExpand Up@@ -930,7 +930,7 @@ macro_rules! get_channel_ref {
	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 {
 $per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 $peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 $peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 }
	}
Expand DownExpand Up@@ -1556,8 +1556,8 @@ macro_rules! check_warn_msg {
/// Checks if at least one peer is connected.
fn is_any_peer_connected(node: &Node) -> bool {
	let peer_state = node.node.per_peer_state.read().unwrap();
	for (_, peer_mutex) in peer_state.iter() {
 let peer = peer_mutex.lock().unwrap();
	for (_, peer_rwlock) in peer_state.iter() {
 let peer = peer_rwlock.read().unwrap();
 if peer.is_connected { return true; }
	}
	false
Expand DownExpand Up@@ -2018,8 +2018,8 @@ pub fn do_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<'_, '

 let node_a_per_peer_state = node_a.node.per_peer_state.read().unwrap();
 let mut number_of_msg_events = 0;
 for (cp_id, peer_state_mutex) in node_a_per_peer_state.iter() {
 let peer_state = peer_state_mutex.lock().unwrap();
 for (cp_id, peer_state) in node_a_per_peer_state.iter() {
 let peer_state = peer_state.write().unwrap();
 let cp_pending_msg_events = &peer_state.pending_msg_events;
 number_of_msg_events += cp_pending_msg_events.len();
 if cp_pending_msg_events.len() == 1 {
Expand DownExpand Up@@ -2853,7 +2853,7 @@ pub fn pass_claimed_payment_along_route<'a, 'b, 'c, 'd>(args: ClaimAlongRouteArg
 let (base_fee, prop_fee) = {
 let per_peer_state = $node.node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
 if let Some(prev_config) = channel.context().prev_config() {
 (prev_config.forwarding_fee_base_msat as u64,
Expand DownExpand Up@@ -3458,7 +3458,7 @@ pub fn get_announce_close_broadcast_events<'a, 'b, 'c>(nodes: &Vec<Node<'a, 'b,
macro_rules! get_channel_value_stat {
	($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
 let peer_state_lock = $node.node.per_peer_state.read().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&$channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand Down

34 changes: 17 additions & 17 deletions
lightning/src/ln/functional_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -699,7 +699,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -710,7 +710,7 @@ fn test_update_fee_that_funder_cannot_afford() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -727,7 +727,7 @@ fn test_update_fee_that_funder_cannot_afford() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1429,7 +1429,7 @@ fn test_fee_spike_violation_fails_htlc() {
	// needed to sign the new commitment tx and (2) sign the new commitment tx.
	let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand All@@ -1445,7 +1445,7 @@ fn test_fee_spike_violation_fails_htlc() {
	};
	let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 let remote_chan = chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -1476,7 +1476,7 @@ fn test_fee_spike_violation_fails_htlc() {

	let res = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let local_chan = local_chan_lock.channel_by_id.get(&chan.2).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap();
Expand DownExpand Up@@ -3236,7 +3236,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 // The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
 // well, so HTLCs at exactly the dust limit will not be included in commitment txn.
 nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
 .unwrap().write().unwrap().channel_by_id.get(&chan_2.2).unwrap().context().holder_dust_limit_satoshis * 1000
	} else { 3000000 };

	let (_, first_payment_hash, ..) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
Expand DownExpand Up@@ -5209,7 +5209,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
	assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);

	let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context().holder_dust_limit_satoshis;
	// 0th HTLC:
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
	// 1st HTLC:
Expand DownExpand Up@@ -6344,7 +6344,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
	let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().counterparty_max_accepted_htlcs as u64;

	// Fetch a route in advance as we will be unable to once we're unable to send.
	let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
Expand DownExpand Up@@ -6415,7 +6415,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
	let htlc_minimum_msat: u64;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
 htlc_minimum_msat = channel.context().get_holder_htlc_minimum_msat();
	}
Expand DownExpand Up@@ -7021,7 +7021,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
	let chan =create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	// We route 2 dust-HTLCs between A and B
	let (_, payment_hash_1, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
Expand DownExpand Up@@ -7114,7 +7114,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
	let chan = create_announced_chan_between_nodes(&nodes, 0, 1);

	let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;
 .unwrap().write().unwrap().channel_by_id.get(&chan.2).unwrap().context().holder_dust_limit_satoshis;

	let (_payment_preimage_1, dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
	let (_payment_preimage_2, non_dust_hash, ..) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
Expand DownExpand Up@@ -7796,7 +7796,7 @@ fn test_counterparty_raa_skip_no_crash() {
	let next_per_commitment_point;
	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let keys = guard.channel_by_id.get_mut(&channel_id).map(
 |phase| if let ChannelPhase::Funded(chan) = phase { Some(chan) } else { None }
 ).flatten().unwrap().get_signer();
Expand DownExpand Up@@ -9227,7 +9227,7 @@ fn test_duplicate_chan_id() {

	let funding_created = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let mut a_peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 // Once we call `get_funding_created` the channel has a duplicate channel_id as
 // another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
 // try to create another channel. Instead, we drop the channel entirely here (leaving the
Expand DownExpand Up@@ -9942,7 +9942,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e

	let (dust_buffer_feerate, max_dust_htlc_exposure_msat) = {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
 (chan.context().get_dust_buffer_feerate(None) as u64,
 chan.context().get_max_dust_htlc_exposure_msat(&LowerBoundedFeeEstimator(nodes[0].fee_estimator)))
Expand DownExpand Up@@ -10440,7 +10440,7 @@ fn test_remove_expired_outbound_unfunded_channels() {
	// Asserts the outbound channel has been removed from a nodes[0]'s peer state map.
	let check_outbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand DownExpand Up@@ -10491,7 +10491,7 @@ fn test_remove_expired_inbound_unfunded_channels() {
	// Asserts the inbound channel has been removed from a nodes[1]'s peer state map.
	let check_inbound_channel_existence = |should_exist: bool| {
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
 let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(chan_lock.channel_by_id.contains_key(&temp_channel_id), should_exist);
	};

Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/onion_route_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -515,7 +515,7 @@ fn test_onion_failure() {

	let short_channel_id = channels[1].0.contents.short_channel_id;
	let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .unwrap().write().unwrap().channel_by_id.get(&channels[1].2).unwrap()
 .context().get_counterparty_htlc_minimum_msat() - 1;
	let mut bogus_route = route.clone();
	let route_len = bogus_route.paths[0].hops.len();
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -796,7 +796,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
	{
 let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
 .unwrap().lock().unwrap();
 .unwrap().write().unwrap();
 let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
 let mut new_config = channel.context().config();
 new_config.forwarding_fee_base_msat += 100_000;
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

	{
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 1);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
	}
Expand DownExpand Up@@ -294,7 +294,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand DownExpand Up@@ -340,7 +340,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_

 {
 let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
 let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().write().unwrap();
 assert_eq!(peer_state.channel_by_id.len(), 0);
 assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
 }
Expand Down