@@ -10513,6 +10513,90 @@ fn test_remove_expired_inbound_unfunded_channels() {
10513
10513
check_closed_event(&nodes[1], 1, ClosureReason::HolderForceClosed, false, &[nodes[0].node.get_our_node_id()], 100000);
10514
10514
}
10515
10515
10516
+ #[test]
10517
+ fn test_channel_close_when_not_timely_accepted() {
10518
+ // Create network of two nodes
10519
+ let chanmon_cfgs = create_chanmon_cfgs(2);
10520
+ let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
10521
+ let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
10522
+ let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
10523
+
10524
+ // Simulate peer-disconnects mid-handshake
10525
+ // The channel is initiated from the node 0 side,
10526
+ // but the nodes disconnect before node 1 could send accept channel
10527
+ let create_chan_id = nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None, None).unwrap();
10528
+ let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
10529
+ assert_eq!(open_channel_msg.temporary_channel_id, create_chan_id);
10530
+
10531
+ nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
10532
+ nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
10533
+
10534
+ // Make sure that we have not removed the OutboundV1Channel from node[0] immediately.
10535
+ assert_eq!(nodes[0].node.list_channels().len(), 1);
10536
+
10537
+ // Since channel was inbound from node[1] perspective, it should have been dropped immediately.
10538
+ assert_eq!(nodes[1].node.list_channels().len(), 0);
10539
+
10540
+ // In the meantime, some time passes.
10541
+ for _ in 0..UNFUNDED_CHANNEL_AGE_LIMIT_TICKS {
10542
+ nodes[0].node.timer_tick_occurred();
10543
+ }
10544
+
10545
+ // Since we disconnected from peer and did not connect back within time,
10546
+ // we should have forced-closed the channel by now.
10547
+ check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed, [nodes[1].node.get_our_node_id()], 100000);
10548
+ assert_eq!(nodes[0].node.list_channels().len(), 0);
10549
+
10550
+ {
10551
+ // Since accept channel message was never received
10552
+ // The channel should be forced close by now from node 0 side
10553
+ // and the peer removed from per_peer_state
10554
+ let node_0_per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
10555
+ assert_eq!(node_0_per_peer_state.len(), 0);
10556
+ }
10557
+ }
10558
+
10559
+ #[test]
10560
+ fn test_rebroadcast_open_channel_when_reconnect_mid_handshake() {
10561
+ // Create network of two nodes
10562
+ let chanmon_cfgs = create_chanmon_cfgs(2);
10563
+ let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
10564
+ let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
10565
+ let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
10566
+
10567
+ // Simulate peer-disconnects mid-handshake
10568
+ // The channel is initiated from the node 0 side,
10569
+ // but the nodes disconnect before node 1 could send accept channel
10570
+ let create_chan_id = nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None, None).unwrap();
10571
+ let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
10572
+ assert_eq!(open_channel_msg.temporary_channel_id, create_chan_id);
10573
+
10574
+ nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
10575
+ nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
10576
+
10577
+ // Make sure that we have not removed the OutboundV1Channel from node[0] immediately.
10578
+ assert_eq!(nodes[0].node.list_channels().len(), 1);
10579
+
10580
+ // Since channel was inbound from node[1] perspective, it should have been immediately dropped.
10581
+ assert_eq!(nodes[1].node.list_channels().len(), 0);
10582
+
10583
+ // The peers now reconnect
10584
+ nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init {
10585
+ features: nodes[1].node.init_features(), networks: None, remote_network_address: None
10586
+ }, true).unwrap();
10587
+ nodes[1].node.peer_connected(&nodes[0].node.get_our_node_id(), &msgs::Init {
10588
+ features: nodes[0].node.init_features(), networks: None, remote_network_address: None
10589
+ }, false).unwrap();
10590
+
10591
+ // Make sure the SendOpenChannel message is added to node_0 pending message events
10592
+ let msg_events = nodes[0].node.get_and_clear_pending_msg_events();
10593
+ assert_eq!(msg_events.len(), 1);
10594
+ match &msg_events[0] {
10595
+ MessageSendEvent::SendOpenChannel { msg, .. } => assert_eq!(msg, &open_channel_msg),
10596
+ _ => panic!("Unexpected message."),
10597
+ }
10598
+ }
10599
+
10516
10600
fn do_test_multi_post_event_actions(do_reload: bool) {
10517
10601
// Tests handling multiple post-Event actions at once.
10518
10602
// There is specific code in ChannelManager to handle channels where multiple post-Event
0 commit comments