X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdisk.rs;h=0c3085134bedcd8cf35ca57330a776ad196223a9;hb=ed08c8be205d540a2dac025587c14c106d5d8d5f;hp=7be070c962f4d73e3c9445c8a5a8730fedd71fe3;hpb=e31773bd74197082c327fdeb878f28664ee65e21;p=ldk-sample

diff --git a/src/disk.rs b/src/disk.rs
index 7be070c..0c30851 100644
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -1,17 +1,17 @@
-use crate::cli;
-use bitcoin::secp256k1::key::PublicKey;
-use bitcoin::BlockHash;
+use crate::{cli, NetworkGraph};
+use bitcoin::secp256k1::PublicKey;
+use bitcoin::Network;
 use chrono::Utc;
-use lightning::routing::network_graph::NetworkGraph;
-use lightning::routing::scorer::Scorer;
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{Readable, Writeable, Writer};
+use lightning::util::ser::{ReadableArgs, Writer};
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
-use std::io::{BufRead, BufReader, BufWriter};
+use std::io::{BufRead, BufReader};
 use std::net::SocketAddr;
 use std::path::Path;
+use std::sync::Arc;
 
 pub(crate) struct FilesystemLogger {
 	data_dir: String,
@@ -72,46 +72,26 @@ pub(crate) fn read_channel_peer_data(
 	Ok(peer_data)
 }
 
-pub(crate) fn persist_network(path: &Path, network_graph: &NetworkGraph) -> std::io::Result<()> {
-	let mut tmp_path = path.to_path_buf().into_os_string();
-	tmp_path.push(".tmp");
-	let file = fs::OpenOptions::new().write(true).create(true).open(&tmp_path)?;
-	let write_res = network_graph.write(&mut BufWriter::new(file));
-	if let Err(e) = write_res.and_then(|_| fs::rename(&tmp_path, path)) {
-		let _ = fs::remove_file(&tmp_path);
-		Err(e)
-	} else {
-		Ok(())
-	}
-}
-
-pub(crate) fn read_network(path: &Path, genesis_hash: BlockHash) -> NetworkGraph {
+pub(crate) fn read_network(
+	path: &Path, network: Network, logger: Arc<FilesystemLogger>,
+) -> NetworkGraph {
 	if let Ok(file) = File::open(path) {
-		if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file)) {
+		if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file), logger.clone()) {
 			return graph;
 		}
 	}
-	NetworkGraph::new(genesis_hash)
-}
-
-pub(crate) fn persist_scorer(path: &Path, scorer: &Scorer) -> std::io::Result<()> {
-	let mut tmp_path = path.to_path_buf().into_os_string();
-	tmp_path.push(".tmp");
-	let file = fs::OpenOptions::new().write(true).create(true).open(&tmp_path)?;
-	let write_res = scorer.write(&mut BufWriter::new(file));
-	if let Err(e) = write_res.and_then(|_| fs::rename(&tmp_path, path)) {
-		let _ = fs::remove_file(&tmp_path);
-		Err(e)
-	} else {
-		Ok(())
-	}
+	NetworkGraph::new(network, logger)
 }
 
-pub(crate) fn read_scorer(path: &Path) -> Scorer {
+pub(crate) fn read_scorer(
+	path: &Path, graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
+) -> ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>> {
+	let params = ProbabilisticScoringParameters::default();
 	if let Ok(file) = File::open(path) {
-		if let Ok(scorer) = Scorer::read(&mut BufReader::new(file)) {
+		let args = (params.clone(), Arc::clone(&graph), Arc::clone(&logger));
+		if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
 			return scorer;
 		}
 	}
-	Scorer::default()
+	ProbabilisticScorer::new(params, graph, logger)
 }