f Call io utils with &Config

Author: tnull

src/io_utils.rs

@@ -10,7 +10,7 @@ use std::io::{BufReader, Write};
 use std::path::Path;
 use std::sync::Arc;
 
-pub(crate) fn read_or_generate_seed_file(config: Arc<Config>) -> [u8; 32] {
+pub(crate) fn read_or_generate_seed_file(config: &Config) -> [u8; 32] {
 	let keys_seed_path = format!("{}/keys_seed", config.storage_dir_path);
 	let keys_seed = if Path::new(&keys_seed_path).exists() {
 		let seed = fs::read(keys_seed_path.clone()).expect("Failed to read keys seed file");
@@ -33,10 +33,10 @@ pub(crate) fn read_or_generate_seed_file(config: Arc<Config>) -> [u8; 32] {
 }
 
 pub(crate) fn read_network_graph(
-	config: Arc<Config>, logger: Arc<FilesystemLogger>,
+	config: &Config, logger: Arc<FilesystemLogger>,
 ) -> Result<NetworkGraph, Error> {
-	let ldk_data_dir = format!("{}/ldk", &config.storage_dir_path.clone());
-	let network_graph_path = format!("{}/network_graph", ldk_data_dir.clone());
+	let ldk_data_dir = format!("{}/ldk", &config.storage_dir_path);
+	let network_graph_path = format!("{}/network_graph", ldk_data_dir);
 
 	if let Ok(file) = fs::File::open(network_graph_path) {
 		if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file), Arc::clone(&logger)) {
@@ -50,7 +50,7 @@ pub(crate) fn read_network_graph(
 }
 
 pub(crate) fn read_scorer(
-	config: Arc<Config>, network_graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
+	config: &Config, network_graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
 ) -> Scorer {
 	let ldk_data_dir = format!("{}/ldk", &config.storage_dir_path.clone());
 	let scorer_path = format!("{}/scorer", ldk_data_dir.clone());

src/lib.rs

@@ -208,7 +208,7 @@ impl Builder {
 		let logger = Arc::new(FilesystemLogger::new(log_file_path));
 
 		// Step 1: Initialize the on-chain wallet and chain access
-		let seed = io_utils::read_or_generate_seed_file(Arc::clone(&config));
+		let seed = io_utils::read_or_generate_seed_file(config.as_ref());
 		let xprv = bitcoin::util::bip32::ExtendedPrivKey::new_master(config.network, &seed)
 			.expect("Failed to read wallet master key");
 
@@ -267,11 +267,11 @@ impl Builder {
 
 		// Step 12: Initialize the network graph, scorer, and router
 		let network_graph = Arc::new(
-			io_utils::read_network_graph(Arc::clone(&config), Arc::clone(&logger))
+			io_utils::read_network_graph(config.as_ref(), Arc::clone(&logger))
 				.expect("Failed to read the network graph"),
 		);
 		let scorer = Arc::new(Mutex::new(io_utils::read_scorer(
-			Arc::clone(&config),
+			config.as_ref(),
 			Arc::clone(&network_graph),
 			Arc::clone(&logger),
 		)));