f Move check inside create_chan_..._value_b

Author: tnull

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -1915,8 +1915,13 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
 		node.gossip_sync.handle_channel_update(&as_update).unwrap();
 		node.gossip_sync.handle_channel_update(&bs_update).unwrap();
 	}
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
+
+	if !restore_b_before_lock {
+		expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
+	} else {
+		expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
+	}
+
 
 	send_payment(&nodes[0], &[&nodes[1]], 8000000);
 	close_channel(&nodes[0], &nodes[1], &channel_id, funding_tx, true);

lightning/src/ln/channelmanager.rs

@@ -7838,9 +7838,6 @@ mod tests {
 		let (channel_ready, _) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
 		let (announcement, nodes_0_update, nodes_1_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
 		update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &nodes_0_update, &nodes_1_update);
-		expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-		expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
-
 
 		nodes[0].node.close_channel(channel_id, &nodes[1].node.get_our_node_id()).unwrap();
 		nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &channelmanager::provided_init_features(), &get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id()));

lightning/src/ln/functional_test_utils.rs

@@ -410,8 +410,6 @@ pub fn create_chan_between_nodes<'a, 'b, 'c, 'd>(node_a: &'a Node<'b, 'c, 'd>, n
 pub fn create_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(node_a: &'a Node<'b, 'c, 'd>, node_b: &'a Node<'b, 'c, 'd>, channel_value: u64, push_msat: u64, a_flags: InitFeatures, b_flags: InitFeatures) -> (msgs::ChannelAnnouncement, msgs::ChannelUpdate, msgs::ChannelUpdate, [u8; 32], Transaction) {
 	let (channel_ready, channel_id, tx) = create_chan_between_nodes_with_value_a(node_a, node_b, channel_value, push_msat, a_flags, b_flags);
 	let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(node_a, node_b, &channel_ready);
-	expect_channel_ready_event(&node_a, &node_b.node.get_our_node_id());
-	expect_channel_ready_event(&node_b, &node_a.node.get_our_node_id());
 	(announcement, as_update, bs_update, channel_id, tx)
 }
 
@@ -799,6 +797,7 @@ pub fn create_chan_between_nodes_with_value_confirm<'a, 'b, 'c, 'd>(node_a: &'a
 	create_chan_between_nodes_with_value_confirm_first(node_a, node_b, tx, conf_height);
 	confirm_transaction_at(node_a, tx, conf_height);
 	connect_blocks(node_a, CHAN_CONFIRM_DEPTH - 1);
+	expect_channel_ready_event(&node_a, &node_b.node.get_our_node_id());
 	create_chan_between_nodes_with_value_confirm_second(node_b, node_a)
 }
 
@@ -837,6 +836,7 @@ pub fn create_chan_between_nodes_with_value_b<'a, 'b, 'c>(node_a: &Node<'a, 'b,
 
 	*node_a.network_chan_count.borrow_mut() += 1;
 
+	expect_channel_ready_event(&node_b, &node_a.node.get_our_node_id());
 	((*announcement).clone(), (*as_update).clone(), (*bs_update).clone())
 }
 

lightning/src/ln/functional_tests.rs

@@ -184,8 +184,6 @@ fn do_test_counterparty_no_reserve(send_from_initiator: bool) {
 	let funding_tx = sign_funding_transaction(&nodes[0], &nodes[1], 100_000, temp_channel_id);
 	let funding_msgs = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &funding_tx);
 	create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &funding_msgs.0);
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	// nodes[0] should now be able to send the full balance to nodes[1], violating nodes[1]'s
 	// security model if it ever tries to send funds back to nodes[0] (but that's not our problem).
@@ -3715,7 +3713,6 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 
 	let events_1 = nodes[1].node.get_and_clear_pending_events();
 	if messages_delivered == 0 {
-		expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
 		assert_eq!(events_1.len(), 2);
 		match events_1[0] {
 			Event::ChannelReady { .. } => { },
@@ -4432,8 +4429,6 @@ fn test_no_txn_manager_serialize_deserialize() {
 		node.gossip_sync.handle_channel_update(&as_update).unwrap();
 		node.gossip_sync.handle_channel_update(&bs_update).unwrap();
 	}
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	send_payment(&nodes[0], &[&nodes[1]], 1000000);
 }
@@ -4555,8 +4550,6 @@ fn test_manager_serialize_deserialize_events() {
 		node.gossip_sync.handle_channel_update(&as_update).unwrap();
 		node.gossip_sync.handle_channel_update(&bs_update).unwrap();
 	}
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	send_payment(&nodes[0], &[&nodes[1]], 1000000);
 }
@@ -9451,8 +9444,6 @@ fn test_duplicate_chan_id() {
 	let (channel_ready, _) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
 	let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
 	update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &as_update, &bs_update);
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	send_payment(&nodes[0], &[&nodes[1]], 8000000);
 }
@@ -10381,8 +10372,6 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e
 	let (channel_ready, channel_id) = create_chan_between_nodes_with_value_confirm(&nodes[0], &nodes[1], &tx);
 	let (announcement, as_update, bs_update) = create_chan_between_nodes_with_value_b(&nodes[0], &nodes[1], &channel_ready);
 	update_nodes_with_chan_announce(&nodes, 0, 1, &announcement, &as_update, &bs_update);
-	expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
-	expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
 
 	let dust_buffer_feerate = {
 		let chan_lock = nodes[0].node.channel_state.lock().unwrap();