Split inbound+outbound payments, use PaymentId as outbound key

[ldk-sample] / src / disk.rs

diff --git a/src/disk.rs b/src/disk.rs
index fe614184502d30e5259c6249cfd9eb55bae9a60c..d301180d605202690aa24dd96bbf1bfa2c18d7c2 100644 (file)
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -1,10 +1,10 @@
-use crate::{cli, NetworkGraph};
+use crate::{cli, InboundPaymentInfoStorage, NetworkGraph, OutboundPaymentInfoStorage};
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::BlockHash;
+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::{ReadableArgs, Writer};
+use lightning::util::ser::{Readable, ReadableArgs, Writer};
 use std::collections::HashMap;
 use std::fs;
 use std::fs::File;
@@ -13,6 +13,9 @@ use std::net::SocketAddr;
 use std::path::Path;
 use std::sync::Arc;
 
+pub(crate) const INBOUND_PAYMENTS_FNAME: &str = "inbound_payments";
+pub(crate) const OUTBOUND_PAYMENTS_FNAME: &str = "outbound_payments";
+
 pub(crate) struct FilesystemLogger {
        data_dir: String,
 }
@@ -73,22 +76,40 @@ pub(crate) fn read_channel_peer_data(
 }
 
 pub(crate) fn read_network(
-       path: &Path, genesis_hash: BlockHash, logger: Arc<FilesystemLogger>,
+       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(genesis_hash, logger)
+       NetworkGraph::new(network, logger)
+}
+
+pub(crate) fn read_inbound_payment_info(path: &Path) -> InboundPaymentInfoStorage {
+       if let Ok(file) = File::open(path) {
+               if let Ok(info) = InboundPaymentInfoStorage::read(&mut BufReader::new(file)) {
+                       return info;
+               }
+       }
+       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<NetworkGraph>, logger: Arc<FilesystemLogger>,
 ) -> ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>> {
-       let params = ProbabilisticScoringParameters::default();
+       let params = ProbabilisticScoringDecayParameters::default();
        if let Ok(file) = File::open(path) {
-               let args = (params, Arc::clone(&graph), Arc::clone(&logger));
+               let args = (params.clone(), Arc::clone(&graph), Arc::clone(&logger));
                if let Ok(scorer) = ProbabilisticScorer::read(&mut BufReader::new(file), args) {
                        return scorer;
                }