X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdisk.rs;h=9b9a72b229a90dbd2c4fed34a906537470ff7218;hb=b61dae03855accbafcbbc68c69692cbe1797b195;hp=77cefd6d59a91bc25f26c855d9119235c62df78c;hpb=bd7121e4cacd1f8e1b47bb3fe2d184ebda623ab0;p=ldk-sample diff --git a/src/disk.rs b/src/disk.rs index 77cefd6..9b9a72b 100644 --- a/src/disk.rs +++ b/src/disk.rs @@ -1,8 +1,8 @@ -use crate::{cli, NetworkGraph, PaymentInfoStorage}; +use crate::{cli, InboundPaymentInfoStorage, NetworkGraph, OutboundPaymentInfoStorage}; use bitcoin::secp256k1::PublicKey; use bitcoin::Network; use chrono::Utc; -use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters}; +use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringDecayParameters}; use lightning::util::logger::{Logger, Record}; use lightning::util::ser::{Readable, ReadableArgs, Writer}; use std::collections::HashMap; @@ -27,7 +27,7 @@ impl FilesystemLogger { } } impl Logger for FilesystemLogger { - fn log(&self, record: &Record) { + fn log(&self, record: Record) { let raw_log = record.args.to_string(); let log = format!( "{} {:<5} [{}:{}] {}\n", @@ -86,19 +86,28 @@ pub(crate) fn read_network( NetworkGraph::new(network, logger) } -pub(crate) fn read_payment_info(path: &Path) -> PaymentInfoStorage { +pub(crate) fn read_inbound_payment_info(path: &Path) -> InboundPaymentInfoStorage { if let Ok(file) = File::open(path) { - if let Ok(info) = PaymentInfoStorage::read(&mut BufReader::new(file)) { + if let Ok(info) = InboundPaymentInfoStorage::read(&mut BufReader::new(file)) { return info; } } - PaymentInfoStorage { payments: HashMap::new() } + InboundPaymentInfoStorage { payments: HashMap::new() } +} + +pub(crate) fn read_outbound_payment_info(path: &Path) -> OutboundPaymentInfoStorage { + if let Ok(file) = File::open(path) { + if let Ok(info) = OutboundPaymentInfoStorage::read(&mut BufReader::new(file)) { + return info; + } + } + OutboundPaymentInfoStorage { payments: HashMap::new() } } pub(crate) fn read_scorer( path: &Path, graph: Arc, logger: Arc, ) -> ProbabilisticScorer, Arc> { - let params = ProbabilisticScoringParameters::default(); + let params = ProbabilisticScoringDecayParameters::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) {