TEST - Windows lock order violation

Author: ViktorT-11

lightning-persister/src/lib.rs

@@ -253,29 +253,31 @@ mod tests {
 		let chan = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
 		nodes[1].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
 		check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
-		let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
-		let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
-		let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
-
-		// Set the persister's directory to read-only, which should result in
-		// returning a permanent failure when we then attempt to persist a
-		// channel update.
-		let path = &persister.path_to_channel_data;
-		let mut perms = fs::metadata(path).unwrap().permissions();
-		perms.set_readonly(true);
-		fs::set_permissions(path, perms).unwrap();
-
-		let test_txo = OutPoint {
-			txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
-			index: 0
-		};
-		match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
-			ChannelMonitorUpdateStatus::PermanentFailure => {},
-			_ => panic!("unexpected result from persisting new channel")
-		}
+		{
+			let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
+			let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
+			let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+
+			// Set the persister's directory to read-only, which should result in
+			// returning a permanent failure when we then attempt to persist a
+			// channel update.
+			let path = &persister.path_to_channel_data;
+			let mut perms = fs::metadata(path).unwrap().permissions();
+			perms.set_readonly(true);
+			fs::set_permissions(path, perms).unwrap();
+
+			let test_txo = OutPoint {
+				txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+				index: 0
+			};
+			match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
+				ChannelMonitorUpdateStatus::PermanentFailure => {},
+				_ => panic!("unexpected result from persisting new channel")
+			}
 
+			added_monitors.clear();
+		}
 		nodes[1].node.get_and_clear_pending_msg_events();
-		added_monitors.clear();
 	}
 
 	// Test that if a persister's directory name is invalid, monitor persistence
@@ -292,27 +294,29 @@ mod tests {
 		let chan = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
 		nodes[1].node.force_close_broadcasting_latest_txn(&chan.2, &nodes[0].node.get_our_node_id()).unwrap();
 		check_closed_event!(nodes[1], 1, ClosureReason::HolderForceClosed);
-		let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
-		let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
-		let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
-
-		// Create the persister with an invalid directory name and test that the
-		// channel fails to open because the directories fail to be created. There
-		// don't seem to be invalid filename characters on Unix that Rust doesn't
-		// handle, hence why the test is Windows-only.
-		let persister = FilesystemPersister::new(":<>/".to_string());
-
-		let test_txo = OutPoint {
-			txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
-			index: 0
-		};
-		match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
-			ChannelMonitorUpdateStatus::PermanentFailure => {},
-			_ => panic!("unexpected result from persisting new channel")
-		}
+		{
+			let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
+			let update_map = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap();
+			let update_id = update_map.get(&added_monitors[0].0.to_channel_id()).unwrap();
+
+			// Create the persister with an invalid directory name and test that the
+			// channel fails to open because the directories fail to be created. There
+			// don't seem to be invalid filename characters on Unix that Rust doesn't
+			// handle, hence why the test is Windows-only.
+			let persister = FilesystemPersister::new(":<>/".to_string());
+
+			let test_txo = OutPoint {
+				txid: Txid::from_hex("8984484a580b825b9972d7adb15050b3ab624ccd731946b3eeddb92f4e7ef6be").unwrap(),
+				index: 0
+			};
+			match persister.persist_new_channel(test_txo, &added_monitors[0].1, update_id.2) {
+				ChannelMonitorUpdateStatus::PermanentFailure => {},
+				_ => panic!("unexpected result from persisting new channel")
+			}
 
+			added_monitors.clear();
+		}
 		nodes[1].node.get_and_clear_pending_msg_events();
-		added_monitors.clear();
 	}
 }