← Watch feed
Move `test_peer_storage` to `reload_tests`
Public commit record
60/100 · Adequate
What the developer wrote
Authored by Matt Corallo
Move `test_peer_storage` to `reload_tests`
In general we shouldn't be adding new tests in `channelmanager.rs`
✓ Descriptive subject✓ Provides an explanatory body✓ Mentions testing or verification
What changed, and why it matters
This commit simply moves an existing test function from one file to another within the project's test suite. No production code, behavior, or security properties changed. It is a code-organization cleanup with no security relevance.
Recommended action
No action required; this is a non-functional test relocation.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit relocates the test_peer_storage test from lightning/src/ln/channelmanager.rs to lightning/src/ln/reload_tests.rs without modifying the test body. The diff is a pure move (deletion in one file and insertion in another). There are no changes to runtime logic, APIs, or security controls.
Changed components
lightning/src/ln/channelmanager.rslightning/src/ln/reload_tests.rsInspect captured patch +131 / −128
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index b5f4c95..8183b3c 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -17542,134 +17542,6 @@ mod tests {
}
}
- #[test]
- #[cfg(peer_storage)]
- fn test_peer_storage() {
- let chanmon_cfgs = create_chanmon_cfgs(2);
- let (persister, chain_monitor);
- let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
- let nodes_0_deserialized;
- let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
- let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
-
- let (_, _, cid, _) = create_announced_chan_between_nodes(&nodes, 0, 1);
- send_payment(&nodes[0], &[&nodes[1]], 1000);
- let nodes_0_serialized = nodes[0].node.encode();
- let old_state_monitor = get_monitor!(nodes[0], cid).encode();
- send_payment(&nodes[0], &[&nodes[1]], 10000);
- send_payment(&nodes[0], &[&nodes[1]], 9999);
-
- // Update peer storage with latest commitment txns
- connect_blocks(&nodes[0], 1);
- connect_blocks(&nodes[0], 1);
-
- let peer_storage_msg_events_node0 =
- nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_msg_events();
- let peer_storage_msg_events_node1 =
- nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_msg_events();
- assert_ne!(peer_storage_msg_events_node0.len(), 0);
- assert_ne!(peer_storage_msg_events_node1.len(), 0);
-
- for ps_msg in peer_storage_msg_events_node0 {
- match ps_msg {
- MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
- assert_eq!(*node_id, nodes[1].node.get_our_node_id());
- nodes[1].node.handle_peer_storage(nodes[0].node.get_our_node_id(), msg.clone());
- },
- _ => panic!("Unexpected event"),
- }
- }
-
- for ps_msg in peer_storage_msg_events_node1 {
- match ps_msg {
- MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
- assert_eq!(*node_id, nodes[0].node.get_our_node_id());
- nodes[0].node.handle_peer_storage(nodes[1].node.get_our_node_id(), msg.clone());
- },
- _ => panic!("Unexpected event"),
- }
- }
-
- nodes[0].node.peer_disconnected(nodes[1].node.get_our_node_id());
- nodes[1].node.peer_disconnected(nodes[0].node.get_our_node_id());
-
- // Reload Node!
- // TODO: Handle the case where we've completely forgotten about an active channel.
- reload_node!(
- nodes[0],
- test_default_channel_config(),
- &nodes_0_serialized,
- &[&old_state_monitor[..]],
- persister,
- chain_monitor,
- nodes_0_deserialized
- );
-
- nodes[0]
- .node
- .peer_connected(
- nodes[1].node.get_our_node_id(),
- &msgs::Init {
- features: nodes[1].node.init_features(),
- networks: None,
- remote_network_address: None,
- },
- true,
- )
- .unwrap();
-
- nodes[1]
- .node
- .peer_connected(
- nodes[0].node.get_our_node_id(),
- &msgs::Init {
- features: nodes[0].node.init_features(),
- networks: None,
- remote_network_address: None,
- },
- false,
- )
- .unwrap();
-
- let node_1_events = nodes[1].node.get_and_clear_pending_msg_events();
- assert_eq!(node_1_events.len(), 2);
-
- let node_0_events = nodes[0].node.get_and_clear_pending_msg_events();
- assert_eq!(node_0_events.len(), 1);
-
- match node_0_events[0] {
- MessageSendEvent::SendChannelReestablish { ref node_id, .. } => {
- assert_eq!(*node_id, nodes[1].node.get_our_node_id());
- // nodes[0] would send a stale channel reestablish, so there's no need to handle this.
- },
- _ => panic!("Unexpected event"),
- }
-
- if let MessageSendEvent::SendPeerStorageRetrieval { node_id, msg } = &node_1_events[0] {
- assert_eq!(*node_id, nodes[0].node.get_our_node_id());
- // Should Panic here!
- let res = std::panic::catch_unwind(|| {
- nodes[0]
- .node
- .handle_peer_storage_retrieval(nodes[1].node.get_our_node_id(), msg.clone())
- });
- assert!(res.is_err());
- } else {
- panic!("Unexpected event {node_1_events:?}")
- }
-
- if let MessageSendEvent::SendChannelReestablish { .. } = &node_1_events[1] {
- // After the `peer_storage_retreival` message would come a `channel_reestablish` (which
- // would also cause nodes[0] to panic) but it already went down due to lost state so
- // there's nothing to deliver.
- } else {
- panic!("Unexpected event {node_1_events:?}")
- }
- // When we panic'd, we expect to panic on `Drop`.
- let res = std::panic::catch_unwind(|| drop(nodes));
- assert!(res.is_err());
- }
-
#[test]
#[rustfmt::skip]
fn test_keysend_dup_payment_hash() {
diff --git a/lightning/src/ln/reload_tests.rs b/lightning/src/ln/reload_tests.rs
index 5682b3b..66e7ec6 100644
--- a/lightning/src/ln/reload_tests.rs
+++ b/lightning/src/ln/reload_tests.rs
@@ -1305,3 +1305,134 @@ fn test_htlc_localremoved_persistence() {
let htlc_fail_msg_after_reload = msgs.2.unwrap().update_fail_htlcs[0].clone();
assert_eq!(htlc_fail_msg, htlc_fail_msg_after_reload);
}
+
+
+
+#[test]
+#[cfg(peer_storage)]
+fn test_peer_storage() {
+ let chanmon_cfgs = create_chanmon_cfgs(2);
+ let (persister, chain_monitor);
+ let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+ let nodes_0_deserialized;
+ let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
+ let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
+
+ let (_, _, cid, _) = create_announced_chan_between_nodes(&nodes, 0, 1);
+ send_payment(&nodes[0], &[&nodes[1]], 1000);
+ let nodes_0_serialized = nodes[0].node.encode();
+ let old_state_monitor = get_monitor!(nodes[0], cid).encode();
+ send_payment(&nodes[0], &[&nodes[1]], 10000);
+ send_payment(&nodes[0], &[&nodes[1]], 9999);
+
+ // Update peer storage with latest commitment txns
+ connect_blocks(&nodes[0], 1);
+ connect_blocks(&nodes[0], 1);
+
+ let peer_storage_msg_events_node0 =
+ nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_msg_events();
+ let peer_storage_msg_events_node1 =
+ nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_msg_events();
+ assert_ne!(peer_storage_msg_events_node0.len(), 0);
+ assert_ne!(peer_storage_msg_events_node1.len(), 0);
+
+ for ps_msg in peer_storage_msg_events_node0 {
+ match ps_msg {
+ MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
+ assert_eq!(*node_id, nodes[1].node.get_our_node_id());
+ nodes[1].node.handle_peer_storage(nodes[0].node.get_our_node_id(), msg.clone());
+ },
+ _ => panic!("Unexpected event"),
+ }
+ }
+
+ for ps_msg in peer_storage_msg_events_node1 {
+ match ps_msg {
+ MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
+ assert_eq!(*node_id, nodes[0].node.get_our_node_id());
+ nodes[0].node.handle_peer_storage(nodes[1].node.get_our_node_id(), msg.clone());
+ },
+ _ => panic!("Unexpected event"),
+ }
+ }
+
+ nodes[0].node.peer_disconnected(nodes[1].node.get_our_node_id());
+ nodes[1].node.peer_disconnected(nodes[0].node.get_our_node_id());
+
+ // Reload Node!
+ // TODO: Handle the case where we've completely forgotten about an active channel.
+ reload_node!(
+ nodes[0],
+ test_default_channel_config(),
+ &nodes_0_serialized,
+ &[&old_state_monitor[..]],
+ persister,
+ chain_monitor,
+ nodes_0_deserialized
+ );
+
+ nodes[0]
+ .node
+ .peer_connected(
+ nodes[1].node.get_our_node_id(),
+ &msgs::Init {
+ features: nodes[1].node.init_features(),
+ networks: None,
+ remote_network_address: None,
+ },
+ true,
+ )
+ .unwrap();
+
+ nodes[1]
+ .node
+ .peer_connected(
+ nodes[0].node.get_our_node_id(),
+ &msgs::Init {
+ features: nodes[0].node.init_features(),
+ networks: None,
+ remote_network_address: None,
+ },
+ false,
+ )
+ .unwrap();
+
+ let node_1_events = nodes[1].node.get_and_clear_pending_msg_events();
+ assert_eq!(node_1_events.len(), 2);
+
+ let node_0_events = nodes[0].node.get_and_clear_pending_msg_events();
+ assert_eq!(node_0_events.len(), 1);
+
+ match node_0_events[0] {
+ MessageSendEvent::SendChannelReestablish { ref node_id, .. } => {
+ assert_eq!(*node_id, nodes[1].node.get_our_node_id());
+ // nodes[0] would send a stale channel reestablish, so there's no need to handle this.
+ },
+ _ => panic!("Unexpected event"),
+ }
+
+ if let MessageSendEvent::SendPeerStorageRetrieval { node_id, msg } = &node_1_events[0] {
+ assert_eq!(*node_id, nodes[0].node.get_our_node_id());
+ // Should Panic here!
+ let res = std::panic::catch_unwind(|| {
+ nodes[0]
+ .node
+ .handle_peer_storage_retrieval(nodes[1].node.get_our_node_id(), msg.clone())
+ });
+ assert!(res.is_err());
+ } else {
+ panic!("Unexpected event {node_1_events:?}")
+ }
+
+ if let MessageSendEvent::SendChannelReestablish { .. } = &node_1_events[1] {
+ // After the `peer_storage_retreival` message would come a `channel_reestablish` (which
+ // would also cause nodes[0] to panic) but it already went down due to lost state so
+ // there's nothing to deliver.
+ } else {
+ panic!("Unexpected event {node_1_events:?}")
+ }
+ // When we panic'd, we expect to panic on `Drop`.
+ let res = std::panic::catch_unwind(|| drop(nodes));
+ assert!(res.is_err());
+}
+
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.