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

diff --git a/src/disk.rs b/src/disk.rs
index 827cb7e..0c30851 100644
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -1,14 +1,17 @@
-use crate::cli;
-use bitcoin::secp256k1::key::PublicKey;
+use crate::{cli, NetworkGraph};
+use bitcoin::secp256k1::PublicKey;
+use bitcoin::Network;
+use chrono::Utc;
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::Writer;
+use lightning::util::ser::{ReadableArgs, Writer};
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::net::SocketAddr;
 use std::path::Path;
-use time::OffsetDateTime;
+use std::sync::Arc;
 
 pub(crate) struct FilesystemLogger {
 	data_dir: String,
@@ -25,7 +28,10 @@ impl Logger for FilesystemLogger {
 		let raw_log = record.args.to_string();
 		let log = format!(
 			"{} {:<5} [{}:{}] {}\n",
-			OffsetDateTime::now_utc().format("%F %T"),
+			// Note that a "real" lightning node almost certainly does *not* want subsecond
+			// precision for message-receipt information as it makes log entries a target for
+			// deanonymization attacks. For testing, however, its quite useful.
+			Utc::now().format("%Y-%m-%d %H:%M:%S%.3f"),
 			record.level.to_string(),
 			record.module_path,
 			record.line,
@@ -65,3 +71,27 @@ pub(crate) fn read_channel_peer_data(
 	}
 	Ok(peer_data)
 }
+
+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), logger.clone()) {
+			return graph;
+		}
+	}
+	NetworkGraph::new(network, logger)
+}
+
+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) {
+		let args = (params.clone(), Arc::clone(&graph), Arc::clone(&logger));
+		if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
+			return scorer;
+		}
+	}
+	ProbabilisticScorer::new(params, graph, logger)
+}