Skip to content

1507 followups#1966

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 11 commits into from
Feb 14, 2023
Merged

1507 followups #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9033b43
Track if a peer is connected or not in `ChannelManager`
TheBlueMatt Jan 27, 2023
1a5482a
Don't pass `per_peer_state` to `claim_funds_from_hop`
ViktorT-11 Jan 12, 2023
b852df5
Remove redundant hashmap lookups
ViktorT-11 Jan 12, 2023
a0adc51
Don't clone the Vec in `remove_first_msg_event_to_node`
ViktorT-11 Jan 12, 2023
29ed286
Remove redundant Vec in `get_and_clear_pending_msg_events`
ViktorT-11 Jan 12, 2023
b45d69e
Check `peer_state` existence more idiomatically
ViktorT-11 Jan 13, 2023
3d38364
Update `ChannelManager` docs
ViktorT-11 Jan 15, 2023
6ffd022
Always remove disconnected peers with no channels
ViktorT-11 Jan 17, 2023
4fc15f0
Update unknown peer passed to msg and api functions handling
ViktorT-11 Jan 18, 2023
9ae2810
Initialize `list_channels_with_filter` result vec with capacity
ViktorT-11 Jan 18, 2023
7f6f90d
Don't serialize nodes which we have no channels to
ViktorT-11 Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

// Note that the ordering of the events for different nodes is non-prescriptive, though the
// ordering of the two events that both go to nodes[2] have to stay in the same order.
let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
let messages_a = match nodes_0_event {
MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
_ => panic!("Unexpected event type!"),
};

let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
let send_event_b = SendEvent::from_event(nodes_2_event);
assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

let raa = if test_ignore_second_cs {
let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
match nodes_2_event {
MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down
773 changes: 350 additions & 423 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 7 additions & 11 deletions lightning/src/ln/functional_test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
let ev_index = msg_events.iter().position(|e| { match e {
MessageSendEvent::SendAcceptChannel { node_id, .. } => {
node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
},
}});
if ev_index.is_some() {
let mut updated_msg_events = msg_events.to_vec();
let ev = updated_msg_events.remove(ev_index.unwrap());
(ev, updated_msg_events)
msg_events.remove(ev_index.unwrap())
} else {
panic!("Couldn't find any MessageSendEvent to the node!")
}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
check_added_monitors!(node_b, 1);
node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
let (bs_revoke_and_ack, extra_msg_option) = {
let events = node_b.node.get_and_clear_pending_msg_events();
let mut events = node_b.node.get_and_clear_pending_msg_events();
assert!(events.len() <= 2);
let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
(match node_a_event {
MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
let mut events = origin_node.node.get_and_clear_pending_msg_events();
assert_eq!(events.len(), expected_route.len());
for (path_idx, expected_path) in expected_route.iter().enumerate() {
let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
events = updated_events;
let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
// Once we've gotten through all the HTLCs, the last one should result in a
// PaymentClaimable (but each previous one should not!), .
let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
} else {
for expected_path in expected_paths.iter() {
// For MPP payments, we always want the message to the first node in the path.
let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
per_path_msgs.push(msgs_from_ev!(&ev));
events = updated_events;
}
}

Expand Down
35 changes: 17 additions & 18 deletions lightning/src/ln/functional_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
},
_ => panic!()
}
let events = nodes[1].node.get_and_clear_pending_msg_events();
let mut events = nodes[1].node.get_and_clear_pending_msg_events();
{
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
}
assert_eq!(events.len(), 3);

let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

match nodes_2_event {
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
_ => panic!("Unexpected event"),
}
}

nodes[1].node.process_pending_htlc_forwards();
check_added_monitors!(nodes[1], 1);

let mut events = nodes[1].node.get_and_clear_pending_msg_events();
assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
if deliver_bs_raa {
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
match nodes_2_event {
MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
},
_ => panic!("Unexpected event"),
}
events
} else { events };
}

let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
match nodes_2_event {
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
_ => panic!("Unexpected event"),
}

let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
match nodes_0_event {
MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
if messages_delivered == 1 || messages_delivered == 2 {
expect_payment_path_successful!(nodes[0]);
}

nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
if messages_delivered <= 5 {
nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
}
reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
_ => panic!("Unexpected event"),
}
check_added_monitors!(nodes[1], 1);
let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
assert_eq!(msg_events.len(), 3);
let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

match nodes_2_event {
MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

let payer_pubkey = nodes[0].node.get_our_node_id();
let payee_pubkey = nodes[1].node.get_our_node_id();
nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

let mut events = nodes[0].node.get_and_clear_pending_msg_events();
assert_eq!(events.len(), 2);
let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down
8 changes: 4 additions & 4 deletions lightning/src/ln/payment_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
assert_eq!(events.len(), 2);

// Pass half of the payment along the success path.
let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

// Add the HTLC along the first hop.
let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
let (update_add, commitment_signed) = match fail_path_msgs_1 {
MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
assert_eq!(events.len(), 2);

// Pass half of the payment along the first path.
let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
} else {
// Pass half of the payment along the second path.
let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

// Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down
4 changes: 2 additions & 2 deletions lightning/src/ln/reload_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
assert_eq!(send_events.len(), 2);
let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down
10 changes: 8 additions & 2 deletions lightning/src/ln/reorg_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

// Now check that we can create a new channel
if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
// If we dropped the channel before reloading the node, nodes[1] was also dropped from
// nodes[0] storage, and hence not connected again on startup. We therefore need to
// reconnect to the node before attempting to create a new channel.
nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
}
create_announced_chan_between_nodes(&nodes, 0, 1);
send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
1507 followups by ViktorT-11 · Pull Request #1966 · lightningdevkit/rust-lightning · GitHub
Skip to content
1507 followups#1966

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 11 commits into

from

Feb 14, 2023
 Merged


1507 followups
#1966
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
9033b43

Track if a peer is connected or not in `ChannelManager`


TheBlueMatt Jan 27, 2023
1a5482a

Don't pass `per_peer_state` to `claim_funds_from_hop`


ViktorT-11 Jan 12, 2023
b852df5

Remove redundant hashmap lookups


ViktorT-11 Jan 12, 2023
a0adc51

Don't clone the Vec in `remove_first_msg_event_to_node`


ViktorT-11 Jan 12, 2023
29ed286

Remove redundant Vec in `get_and_clear_pending_msg_events`


ViktorT-11 Jan 12, 2023
b45d69e

Check `peer_state` existence more idiomatically


ViktorT-11 Jan 13, 2023
3d38364

Update `ChannelManager` docs


ViktorT-11 Jan 15, 2023
6ffd022

Always remove disconnected peers with no channels


ViktorT-11 Jan 17, 2023
4fc15f0

Update unknown peer passed to msg and api functions handling


ViktorT-11 Jan 18, 2023
9ae2810

Initialize `list_channels_with_filter` result vec with capacity


ViktorT-11 Jan 18, 2023
7f6f90d

Don't serialize nodes which we have no channels to


ViktorT-11 Feb 4, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -935,7 +935,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {

	// Note that the ordering of the events for different nodes is non-prescriptive, though the
	// ordering of the two events that both go to nodes[2] have to stay in the same order.
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events_3);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events_3);
	let messages_a = match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { node_id, mut updates } => {
 assert_eq!(node_id, nodes[0].node.get_our_node_id());
Expand All@@ -949,12 +949,12 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 _ => panic!("Unexpected event type!"),
	};

	let (nodes_2_event, events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
	let send_event_b = SendEvent::from_event(nodes_2_event);
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	let raa = if test_ignore_second_cs {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
Expand Down

773 changes: 350 additions & 423 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.


18 changes: 7 additions & 11 deletions
lightning/src/ln/functional_test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -572,12 +572,12 @@ macro_rules! get_htlc_update_msgs {
}

/// Fetches the first `msg_event` to the passed `node_id` in the passed `msg_events` vec.
/// Returns the `msg_event`, along with an updated `msg_events` vec with the message removed.
/// Returns the `msg_event`.
///
/// Note that even though `BroadcastChannelAnnouncement` and `BroadcastChannelUpdate`
/// `msg_events` are stored under specific peers, this function does not fetch such `msg_events` as
/// such messages are intended to all peers.
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<MessageSendEvent>) -> (MessageSendEvent, Vec<MessageSendEvent>) {
pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &mut Vec<MessageSendEvent>) -> MessageSendEvent {
	let ev_index = msg_events.iter().position(|e| { match e {
 MessageSendEvent::SendAcceptChannel { node_id, .. } => {
 node_id == msg_node_id
Expand DownExpand Up@@ -641,9 +641,7 @@ pub fn remove_first_msg_event_to_node(msg_node_id: &PublicKey, msg_events: &Vec<
 },
	}});
	if ev_index.is_some() {
 let mut updated_msg_events = msg_events.to_vec();
 let ev = updated_msg_events.remove(ev_index.unwrap());
 (ev, updated_msg_events)
 msg_events.remove(ev_index.unwrap())
	} else {
 panic!("Couldn't find any MessageSendEvent to the node!")
	}
Expand DownExpand Up@@ -1482,9 +1480,9 @@ pub fn do_main_commitment_signed_dance(node_a: &Node<'_, '_, '_>, node_b: &Node<
	check_added_monitors!(node_b, 1);
	node_b.node.handle_commitment_signed(&node_a.node.get_our_node_id(), &as_commitment_signed);
	let (bs_revoke_and_ack, extra_msg_option) = {
 let events = node_b.node.get_and_clear_pending_msg_events();
 let mut events = node_b.node.get_and_clear_pending_msg_events();
 assert!(events.len() <= 2);
 let (node_a_event, events) = remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &events);
 let node_a_event= remove_first_msg_event_to_node(&node_a.node.get_our_node_id(), &mut events);
 (match node_a_event {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 assert_eq!(*node_id, node_a.node.get_our_node_id());
Expand DownExpand Up@@ -1939,8 +1937,7 @@ pub fn pass_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_rou
	let mut events = origin_node.node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), expected_route.len());
	for (path_idx, expected_path) in expected_route.iter().enumerate() {
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 events = updated_events;
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 // Once we've gotten through all the HTLCs, the last one should result in a
 // PaymentClaimable (but each previous one should not!), .
 let expect_payment = path_idx == expected_route.len() - 1;
Expand DownExpand Up@@ -1999,9 +1996,8 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
	} else {
 for expected_path in expected_paths.iter() {
 // For MPP payments, we always want the message to the first node in the path.
 let (ev, updated_events) = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &events);
 let ev = remove_first_msg_event_to_node(&expected_path[0].node.get_our_node_id(), &mut events);
 per_path_msgs.push(msgs_from_ev!(&ev));
 events = updated_events;
 }
	}

Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2747,7 +2747,7 @@ fn test_htlc_on_chain_success() {
 },
 _ => panic!()
	}
	let events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	{
 let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
 assert_eq!(added_monitors.len(), 2);
Expand All@@ -2757,8 +2757,8 @@ fn test_htlc_on_chain_success() {
	}
	assert_eq!(events.len(), 3);

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -3196,14 +3196,15 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
 }
	}

	nodes[1].node.process_pending_htlc_forwards();
	check_added_monitors!(nodes[1], 1);

	let mut events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), if deliver_bs_raa { 4 } else { 3 });

let events = if deliver_bs_raa {
 let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	if deliver_bs_raa {
 let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 match nodes_2_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, .. } } => {
 assert_eq!(nodes[2].node.get_our_node_id(), *node_id);
Expand All@@ -3214,10 +3215,9 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 },
 _ => panic!("Unexpected event"),
 }
 events
	} else { events };
	}

	let (nodes_2_event, events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { msg: msgs::ErrorMessage { channel_id, ref data } }, node_id: _ } => {
 assert_eq!(channel_id, chan_2.2);
Expand All@@ -3226,7 +3226,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
 _ => panic!("Unexpected event"),
	}

	let (nodes_0_event, events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut events);
	match nodes_0_event {
 MessageSendEvent::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fail_htlcs, ref update_fulfill_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed, .. } } => {
 assert!(update_add_htlcs.is_empty());
Expand DownExpand Up@@ -3839,9 +3839,10 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
	if messages_delivered == 1 || messages_delivered == 2 {
 expect_payment_path_successful!(nodes[0]);
	}

	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	if messages_delivered <= 5 {
 nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id(), false);
 nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
	}
	reconnect_nodes(&nodes[0], &nodes[1], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));

	if messages_delivered > 2 {
Expand DownExpand Up@@ -4641,10 +4642,10 @@ fn test_onchain_to_onchain_claim() {
 _ => panic!("Unexpected event"),
	}
	check_added_monitors!(nodes[1], 1);
	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	let mut msg_events = nodes[1].node.get_and_clear_pending_msg_events();
	assert_eq!(msg_events.len(), 3);
	let (nodes_2_event, msg_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &msg_events);
	let (nodes_0_event, msg_events) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &msg_events);
	let nodes_2_event= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut msg_events);
	let nodes_0_event= remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &mut msg_events);

	match nodes_2_event {
 MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { .. }, node_id: _ } => {},
Expand DownExpand Up@@ -9210,8 +9211,6 @@ fn test_keysend_payments_to_private_node() {

	let payer_pubkey = nodes[0].node.get_our_node_id();
	let payee_pubkey = nodes[1].node.get_our_node_id();
	nodes[0].node.peer_connected(&payee_pubkey, &msgs::Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	nodes[1].node.peer_connected(&payer_pubkey, &msgs::Init { features: nodes[0].node.init_features(), remote_network_address: None }).unwrap();

	let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
	let route_params = RouteParameters {
Expand DownExpand Up@@ -9285,7 +9284,7 @@ fn test_double_partial_claim() {

	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(events.len(), 2);
	let (node_1_msgs, _events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	// At this point nodes[3] has received one half of the payment, and the user goes to handle
Expand Down

8 changes: 4 additions & 4 deletions
lightning/src/ln/payment_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,11 +153,11 @@ fn mpp_retry() {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the success path.
	let (success_path_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let success_path_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 2_000_000, payment_hash, Some(payment_secret), success_path_msgs, false, None);

	// Add the HTLC along the first hop.
	let (fail_path_msgs_1, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
	let fail_path_msgs_1= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
	let (update_add, commitment_signed) = match fail_path_msgs_1 {
 MessageSendEvent::UpdateHTLCs { node_id: _, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref update_fee, ref commitment_signed } } => {
 assert_eq!(update_add_htlcs.len(), 1);
Expand DownExpand Up@@ -237,7 +237,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
	assert_eq!(events.len(), 2);

	// Pass half of the payment along the first path.
	let (node_1_msgs, mut events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut events);
	pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_1_msgs, false, None);

	if send_partial_mpp {
Expand DownExpand Up@@ -265,7 +265,7 @@ fn do_mpp_receive_timeout(send_partial_mpp: bool) {
 expect_payment_failed_conditions(&nodes[0], payment_hash, false, PaymentFailedConditions::new().mpp_parts_remain().expected_htlc_error_data(23, &[][..]));
	} else {
 // Pass half of the payment along the second path.
 let (node_2_msgs, _events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events);
 let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut events);
 pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 200_000, payment_hash, Some(payment_secret), node_2_msgs, true, None);

 // Even after MPP_TIMEOUT_TICKS we should not timeout the MPP if we have all the parts
Expand Down

4 changes: 2 additions & 2 deletions
lightning/src/ln/reload_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,8 +701,8 @@ fn do_test_partial_claim_before_restart(persist_both_monitors: bool) {
	// Send the payment through to nodes[3] *without* clearing the PaymentClaimable event
	let mut send_events = nodes[0].node.get_and_clear_pending_msg_events();
	assert_eq!(send_events.len(), 2);
	let (node_1_msgs, mut send_events) = remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &send_events);
	let (node_2_msgs, _send_events) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &send_events);
	let node_1_msgs= remove_first_msg_event_to_node(&nodes[1].node.get_our_node_id(), &mut send_events);
	let node_2_msgs= remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &mut send_events);
	do_pass_along_path(&nodes[0], &[&nodes[1], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_1_msgs, true, false, None);
	do_pass_along_path(&nodes[0], &[&nodes[2], &nodes[3]], 15_000_000, payment_hash, Some(payment_secret), node_2_msgs, true, false, None);

Expand Down

10 changes: 8 additions & 2 deletions
lightning/src/ln/reorg_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ use crate::chain::channelmonitor::ANTI_REORG_DELAY;
use crate::chain::transaction::OutPoint;
use crate::chain::Confirm;
use crate::ln::channelmanager::ChannelManager;
use crate::ln::msgs::ChannelMessageHandler;
use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::ln::msgs::{ChannelMessageHandler, Init};
use crate::util::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
use crate::util::test_utils;
use crate::util::ser::Writeable;

Expand DownExpand Up@@ -374,6 +374,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();

	// Now check that we can create a new channel
	if reload_node && nodes[0].node.per_peer_state.read().unwrap().len() == 0 {
 // If we dropped the channel before reloading the node, nodes[1] was also dropped from
 // nodes[0] storage, and hence not connected again on startup. We therefore need to
 // reconnect to the node before attempting to create a new channel.
 nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &Init { features: nodes[1].node.init_features(), remote_network_address: None }).unwrap();
	}
	create_announced_chan_between_nodes(&nodes, 0, 1);
	send_payment(&nodes[0], &[&nodes[1]], 8000000);
}
Expand Down