Tests: take netgraph locks after peer_state

Previously we were taking the NetworkGraph::{channels,nodes} locks before
ChannelManager::per_peer_state's peer_state locks in some tests, which violated
a lock order requirement we have in ChannelManager to take netgraph locks
*after* peer_state locks. See OffersMessageFlow::path_for_release_htlc which is
called while a peer_state lock is held and takes netgraph locks while creating
blinded paths.

Author: valentinewallace

lightning/src/ln/functional_test_utils.rs

@@ -2647,11 +2647,12 @@ pub fn get_route(send_node: &Node, route_params: &RouteParameters) -> Result<Rou
 	let scorer = TestScorer::new();
 	let keys_manager = TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 	let random_seed_bytes = keys_manager.get_secure_random_bytes();
+	let first_hops = send_node.node.list_usable_channels();
 	router::get_route(
 		&send_node.node.get_our_node_id(),
 		route_params,
 		&send_node.network_graph.read_only(),
-		Some(&send_node.node.list_usable_channels().iter().collect::<Vec<_>>()),
+		Some(&first_hops.iter().collect::<Vec<_>>()),
 		send_node.logger,
 		&scorer,
 		&Default::default(),

lightning/src/ln/onion_route_tests.rs

@@ -2392,14 +2392,15 @@ macro_rules! get_phantom_route {
 			])])
 			.unwrap();
 		let scorer = test_utils::TestScorer::new();
+		let first_hops = $nodes[0].node.list_usable_channels();
 		let network_graph = $nodes[0].network_graph.read_only();
 		let route_params = RouteParameters::from_payment_params_and_value(payment_params, $amt);
 		(
 			get_route(
 				&$nodes[0].node.get_our_node_id(),
 				&route_params,
 				&network_graph,
-				Some(&$nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
+				Some(&first_hops.iter().collect::<Vec<_>>()),
 				$nodes[0].logger,
 				&scorer,
 				&Default::default(),

lightning/src/ln/payment_tests.rs

@@ -1453,11 +1453,12 @@ fn get_ldk_payment_preimage() {
 	let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
 	let random_seed_bytes = keys_manager.get_secure_random_bytes();
 	let route_params = RouteParameters::from_payment_params_and_value(payment_params, amt_msat);
+	let first_hops = nodes[0].node.list_usable_channels();
 	let route = get_route(
 		&node_a_id,
 		&route_params,
 		&nodes[0].network_graph.read_only(),
-		Some(&nodes[0].node.list_usable_channels().iter().collect::<Vec<_>>()),
+		Some(&first_hops.iter().collect::<Vec<_>>()),
 		nodes[0].logger,
 		&scorer,
 		&Default::default(),