f use utils more

Author: TheBlueMatt

lightning/src/routing/router.rs

@@ -5664,17 +5664,15 @@ mod tests {
 	fn generate_routes() {
 		use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 
-		let mut d = match super::bench_utils::get_route_file() {
+		let logger = ln_test_utils::TestLogger::new();
+		let graph = match super::bench_utils::read_network_graph(&logger) {
 			Ok(f) => f,
 			Err(e) => {
 				eprintln!("{}", e);
 				return;
 			},
 		};
 
-		let logger = ln_test_utils::TestLogger::new();
-		let graph = NetworkGraph::read(&mut d, &logger).unwrap();
-
 		let params = ProbabilisticScoringParameters::default();
 		let mut scorer = ProbabilisticScorer::new(params, &graph, &logger);
 		let features = super::InvoiceFeatures::empty();
@@ -5687,15 +5685,14 @@ mod tests {
 	fn generate_routes_mpp() {
 		use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 
-		let mut d = match super::bench_utils::get_route_file() {
+		let logger = ln_test_utils::TestLogger::new();
+		let graph = match super::bench_utils::read_network_graph(&logger) {
 			Ok(f) => f,
 			Err(e) => {
 				eprintln!("{}", e);
 				return;
 			},
 		};
-		let logger = ln_test_utils::TestLogger::new();
-		let graph = NetworkGraph::read(&mut d, &logger).unwrap();
 
 		let params = ProbabilisticScoringParameters::default();
 		let mut scorer = ProbabilisticScorer::new(params, &graph, &logger);