Skip to content

Store channels per-peer#1507

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 17 commits into from
Jan 10, 2023
Merged

Store channels per-peer #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ce5cc73
Add `counterparty_node` to test macros
ViktorT-11 May 27, 2022
48f9c72
Add `ChannelManager::PeerState::latest_features` docs
ViktorT-11 Nov 26, 2022
4207eab
Add `try_write` function to `FairRwLock`
ViktorT-11 Dec 8, 2022
1ab25a0
Store channels per peer
ViktorT-11 Nov 26, 2022
b8ca7c9
Remove unnecessary `per_peer_state` branch
ViktorT-11 Jun 10, 2022
ff9840e
Avoid unnecessary immediate retake `per_peer_state` lock
ViktorT-11 Dec 8, 2022
0eb74ec
Unify failure to query `Channel` error messages
ViktorT-11 Jun 6, 2022
8c175f5
Add duplicate temporary_channel_id for 2 peers test
ViktorT-11 May 31, 2022
5578d79
Add handle unkown peer test
ViktorT-11 Jun 13, 2022
c42323c
Remove unnecessary channel counterparty checks
ViktorT-11 Dec 10, 2022
9e7c02c
Remove one tab level when accessing a `peer_state`
ViktorT-11 Dec 10, 2022
e2c5cb5
Update `id_to_peer` docs with consistency guarantees info
ViktorT-11 Dec 10, 2022
1b70a1e
Avoid unnecessary looping over all peers' channels
ViktorT-11 Dec 10, 2022
228fbc2
Use correct node in `test_invalid_upfront_shutdown_script`
ViktorT-11 Jan 3, 2023
6cb9853
Store `pending_msg_events` per peer
ViktorT-11 Dec 19, 2022
cb952f6
Expect `pending_msg_events` to be in random peer order in tests
ViktorT-11 Jan 3, 2023
23fdcca
Remove the `ChannelManager::channel_state`
ViktorT-11 Jan 6, 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
30 changes: 21 additions & 9 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
assert_eq!(updates.update_fulfill_htlcs.len(), 1);
nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
{
let mut node_0_per_peer_lock;
let mut node_0_peer_state_lock;
let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
// Check that even though the persister is returning a InProgress,
// because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
} else { assert!(false); }
} else { assert!(false); };
}

check_added_monitors!(nodes[0], 1);
let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
match events_3.remove(1) {
let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
match nodes_2_event {
MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
assert_eq!(node_id, nodes[2].node.get_our_node_id());
Some(msg.clone())
},
_ => panic!("Unexpected event"),
}
} else { None };
let send_event_b = SendEvent::from_event(events_3.remove(0));
assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
check_added_monitors!(nodes[2], 1);

let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
// As both messages are for nodes[1], they're in order.
assert_eq!(bs_revoke_and_commit.len(), 2);
match bs_revoke_and_commit[0] {
MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
{
let mut lock;
get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
let mut node_0_per_peer_lock;
let mut node_0_peer_state_lock;
let mut node_1_per_peer_lock;
let mut node_1_peer_state_lock;
get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
}

// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Store `channels` per-peer by ViktorT-11 · Pull Request #1507 · lightningdevkit/rust-lightning · GitHub
Skip to content
Store channels per-peer#1507

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading

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

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 17 commits into

from

Jan 10, 2023
 Merged


Store channels per-peer
#1507
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
ce5cc73

Add `counterparty_node` to test macros


ViktorT-11 May 27, 2022
48f9c72

Add `ChannelManager::PeerState::latest_features` docs


ViktorT-11 Nov 26, 2022
4207eab

Add `try_write` function to `FairRwLock`


ViktorT-11 Dec 8, 2022
1ab25a0

Store channels per peer


ViktorT-11 Nov 26, 2022
b8ca7c9

Remove unnecessary `per_peer_state` branch


ViktorT-11 Jun 10, 2022
ff9840e

Avoid unnecessary immediate retake `per_peer_state` lock


ViktorT-11 Dec 8, 2022
0eb74ec

Unify failure to query `Channel` error messages


ViktorT-11 Jun 6, 2022
8c175f5

Add duplicate temporary_channel_id for 2 peers test


ViktorT-11 May 31, 2022
5578d79

Add handle unkown peer test


ViktorT-11 Jun 13, 2022
c42323c

Remove unnecessary channel counterparty checks


ViktorT-11 Dec 10, 2022
9e7c02c

Remove one tab level when accessing a `peer_state`


ViktorT-11 Dec 10, 2022
e2c5cb5

Update `id_to_peer` docs with consistency guarantees info


ViktorT-11 Dec 10, 2022
1b70a1e

Avoid unnecessary looping over all peers' channels


ViktorT-11 Dec 10, 2022
228fbc2

Use correct node in `test_invalid_upfront_shutdown_script`


ViktorT-11 Jan 3, 2023
6cb9853

Store `pending_msg_events` per peer


ViktorT-11 Dec 19, 2022
cb952f6

Expect `pending_msg_events` to be in random peer order in tests


ViktorT-11 Jan 3, 2023
23fdcca

Remove the `ChannelManager::channel_state`


ViktorT-11 Jan 6, 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


30 changes: 21 additions & 9 deletions
lightning/src/ln/chanmon_update_fail_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,10 @@ fn test_monitor_and_persister_update_fail() {
	let updates = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
	assert_eq!(updates.update_fulfill_htlcs.len(), 1);
	nodes[0].node.handle_update_fulfill_htlc(&nodes[1].node.get_our_node_id(), &updates.update_fulfill_htlcs[0]);
	if let Some(ref mut channel) = nodes[0].node.channel_state.lock().unwrap().by_id.get_mut(&chan.2) {
	{
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut channel = get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan.2);
 if let Ok((_, _, update)) = channel.commitment_signed(&updates.commitment_signed, &node_cfgs[0].logger) {
 // Check that even though the persister is returning a InProgress,
 // because the update is bogus, ultimately the error that's returned
Expand All@@ -148,7 +151,7 @@ fn test_monitor_and_persister_update_fail() {
 logger.assert_log_regex("lightning::chain::chainmonitor".to_string(), regex::Regex::new("Persistence of ChannelMonitorUpdate for channel [0-9a-f]* in progress").unwrap(), 1);
 assert_eq!(nodes[0].chain_monitor.update_channel(outpoint, update), ChannelMonitorUpdateStatus::Completed);
 } else { assert!(false); }
	} else { assert!(false); };
	}

	check_added_monitors!(nodes[0], 1);
	let events = nodes[0].node.get_and_clear_pending_events();
Expand DownExpand Up@@ -932,7 +935,8 @@ 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 messages_a = match events_3.pop().unwrap() {
	let (nodes_0_event, events_3) = remove_first_msg_event_to_node(&nodes[0].node.get_our_node_id(), &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());
 assert!(updates.update_fulfill_htlcs.is_empty());
Expand All@@ -944,17 +948,21 @@ 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 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 {
 match events_3.remove(1) {
 let (nodes_2_event, _events_3) = remove_first_msg_event_to_node(&nodes[2].node.get_our_node_id(), &events_3);
 match nodes_2_event {
 MessageSendEvent::SendRevokeAndACK { node_id, msg } => {
 assert_eq!(node_id, nodes[2].node.get_our_node_id());
 Some(msg.clone())
 },
 _ => panic!("Unexpected event"),
 }
	} else { None };
	let send_event_b = SendEvent::from_event(events_3.remove(0));
	assert_eq!(send_event_b.node_id, nodes[2].node.get_our_node_id());

	// Now deliver the new messages...

Expand DownExpand Up@@ -988,6 +996,7 @@ fn do_test_monitor_update_fail_raa(test_ignore_second_cs: bool) {
 check_added_monitors!(nodes[2], 1);

 let bs_revoke_and_commit = nodes[2].node.get_and_clear_pending_msg_events();
 // As both messages are for nodes[1], they're in order.
 assert_eq!(bs_revoke_and_commit.len(), 2);
 match bs_revoke_and_commit[0] {
 MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
Expand DownExpand Up@@ -1415,9 +1424,12 @@ fn monitor_failed_no_reestablish_response() {
	let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
	let channel_id = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()).2;
	{
 let mut lock;
 get_channel_ref!(nodes[0], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 let mut node_0_per_peer_lock;
 let mut node_0_peer_state_lock;
 let mut node_1_per_peer_lock;
 let mut node_1_peer_state_lock;
 get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
 get_channel_ref!(nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
	}

	// Route the payment and deliver the initial commitment_signed (with a monitor update failure
Expand Down
Loading