f - Store per peer: aquire locks inside get_channel_ref

Author: ViktorTigerstrom

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -1413,12 +1413,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, InitFeatures::known(), InitFeatures::known()).2;
 	{
-		let node_0_per_peer_lock = nodes[0].node.per_peer_state.write().unwrap();
-		let mut node_0_peer_state_lock = node_0_per_peer_lock.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
-		let node_1_per_peer_lock = nodes[1].node.per_peer_state.write().unwrap();
-		let mut node_1_peer_state_lock = node_1_per_peer_lock.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
-		get_channel_ref!(nodes[0], node_0_peer_state_lock, channel_id).announcement_sigs_state = AnnouncementSigsState::PeerReceived;
-		get_channel_ref!(nodes[1], node_1_peer_state_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

lightning/src/ln/functional_test_utils.rs

@@ -510,8 +510,10 @@ macro_rules! get_htlc_update_msgs {
 
 #[cfg(test)]
 macro_rules! get_channel_ref {
-	($node: expr, $peer_state_lock: ident, $channel_id: expr) => {
+	($node: expr, $counterparty_node: expr, $per_peer_state_lock: ident, $peer_state_lock: ident, $channel_id: expr) => {
 		{
+			$per_peer_state_lock = $node.node.per_peer_state.write().unwrap();
+			$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
 			$peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
 		}
 	}
@@ -521,9 +523,9 @@ macro_rules! get_channel_ref {
 macro_rules! get_feerate {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {
 		{
-			let per_peer_lock = $node.node.per_peer_state.write().unwrap();
-			let mut peer_state_lock = per_peer_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-			let chan = get_channel_ref!($node, peer_state_lock, $channel_id);
+			let mut per_peer_state_lock;
+			let mut peer_state_lock;
+			let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 			chan.get_feerate()
 		}
 	}
@@ -533,9 +535,9 @@ macro_rules! get_feerate {
 macro_rules! get_opt_anchors {
 	($node: expr, $counterparty_node: expr, $channel_id: expr) => {
 		{
-			let per_peer_lock = $node.node.per_peer_state.write().unwrap();
-			let mut peer_state_lock = per_peer_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-			let chan = get_channel_ref!($node, peer_state_lock, $channel_id);
+			let mut per_peer_state_lock;
+			let mut peer_state_lock;
+			let chan = get_channel_ref!($node, $counterparty_node, per_peer_state_lock, peer_state_lock, $channel_id);
 			chan.opt_anchors()
 		}
 	}

lightning/src/ln/functional_tests.rs

@@ -173,9 +173,9 @@ fn do_test_counterparty_no_reserve(send_from_initiator: bool) {
 	{
 		let sender_node = if send_from_initiator { &nodes[1] } else { &nodes[0] };
 		let counterparty_node = if send_from_initiator { &nodes[0] } else { &nodes[1] };
-		let per_peer_lock = sender_node.node.per_peer_state.write().unwrap();
-		let mut peer_state_lock = per_peer_lock.get(&counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
-		let mut chan = get_channel_ref!(sender_node, peer_state_lock, temp_channel_id);
+		let mut sender_node_per_peer_lock;
+		let mut sender_node_peer_state_lock;
+		let mut chan = get_channel_ref!(sender_node, counterparty_node, sender_node_per_peer_lock, sender_node_peer_state_lock, temp_channel_id);
 		chan.holder_selected_channel_reserve_satoshis = 0;
 		chan.holder_max_htlc_value_in_flight_msat = 100_000_000;
 	}
@@ -8473,9 +8473,9 @@ fn test_reject_funding_before_inbound_channel_accepted() {
 	// `handle_accept_channel`, which is required in order for `create_funding_transaction` to
 	// succeed when `nodes[0]` is passed to it.
 	{
-		let per_peer_lock = nodes[1].node.per_peer_state.write().unwrap();
-		let mut peer_state_lock = per_peer_lock.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
-		let channel = get_channel_ref!(&nodes[1], peer_state_lock, temp_channel_id);
+		let mut node_1_per_peer_lock;
+		let mut node_1_peer_state_lock;
+		let channel =  get_channel_ref!(&nodes[1], nodes[0], node_1_per_peer_lock, node_1_peer_state_lock, temp_channel_id);
 		let accept_chan_msg = channel.get_accept_channel_message();
 		nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), InitFeatures::known(), &accept_chan_msg);
 	}

lightning/src/ln/shutdown_tests.rs

@@ -762,9 +762,9 @@ fn do_test_closing_signed_reinit_timeout(timeout_step: TimeoutStep) {
 		// nodes[1] should happily accept and respond to.
 		node_0_closing_signed.fee_range.as_mut().unwrap().max_fee_satoshis *= 10;
 		{
-			let per_peer_lock = nodes[0].node.per_peer_state.write().unwrap();
-			let mut peer_state_lock = per_peer_lock.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
-			get_channel_ref!(nodes[0], peer_state_lock, chan_id).closing_fee_limits.as_mut().unwrap().1 *= 10;
+			let mut node_0_per_peer_lock;
+			let mut node_0_peer_state_lock;
+			get_channel_ref!(nodes[0], nodes[1], node_0_per_peer_lock, node_0_peer_state_lock, chan_id).closing_fee_limits.as_mut().unwrap().1 *= 10;
 		}
 		nodes[1].node.handle_closing_signed(&nodes[0].node.get_our_node_id(), &node_0_closing_signed);
 		let node_1_closing_signed = get_event_msg!(nodes[1], MessageSendEvent::SendClosingSigned, nodes[0].node.get_our_node_id());