Merge pull request lightningdevkit#2886 from TheBlueMatt/2024-02-actu…

…ally-fix-build Fix silent merge conflict introduced in d3ddf15 @TheBlueMatt
jonmarrs · Feb 9, 2024 · 81cc0d3 · 81cc0d3
2 parents aaacaf4 + ee34bcf
commit 81cc0d3
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 161 deletions.
diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
@@ -10532,7 +10532,7 @@ fn test_channel_close_when_not_timely_accepted() {
 	// but the nodes disconnect before node 1 could send accept channel
 	let create_chan_id = nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None, None).unwrap();
 	let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
-	assert_eq!(open_channel_msg.temporary_channel_id, create_chan_id);
+	assert_eq!(open_channel_msg.common_fields.temporary_channel_id, create_chan_id);
 
 	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());
@@ -10575,7 +10575,7 @@ fn test_rebroadcast_open_channel_when_reconnect_mid_handshake() {
 	// but the nodes disconnect before node 1 could send accept channel
 	let create_chan_id = nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42, None, None).unwrap();
 	let open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id());
-	assert_eq!(open_channel_msg.temporary_channel_id, create_chan_id);
+	assert_eq!(open_channel_msg.common_fields.temporary_channel_id, create_chan_id);
 
 	nodes[0].node.peer_disconnected(&nodes[1].node.get_our_node_id());
 	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id());