projects
/
ldk-sample
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new `ProbabilisticScorer` instead of the deprecated `Scorer`
[ldk-sample]
/
src
/
disk.rs
diff --git
a/src/disk.rs
b/src/disk.rs
index b019626440b6e80e9703d4e5de87d57658cd055a..af565bc5b8afac37e05c43bb2e6f2ce855800f47 100644
(file)
--- a/
src/disk.rs
+++ b/
src/disk.rs
@@
-3,15
+3,16
@@
use bitcoin::secp256k1::key::PublicKey;
use bitcoin::BlockHash;
use chrono::Utc;
use lightning::routing::network_graph::NetworkGraph;
use bitcoin::BlockHash;
use chrono::Utc;
use lightning::routing::network_graph::NetworkGraph;
-use lightning::routing::scoring::
Scorer
;
+use lightning::routing::scoring::
{ProbabilisticScorer, ProbabilisticScoringParameters}
;
use lightning::util::logger::{Logger, Record};
use lightning::util::logger::{Logger, Record};
-use lightning::util::ser::{Readable, Writeable, Writer};
+use lightning::util::ser::{Readable,
ReadableArgs,
Writeable, Writer};
use std::collections::HashMap;
use std::fs;
use std::fs::File;
use std::io::{BufRead, BufReader, BufWriter};
use std::net::SocketAddr;
use std::path::Path;
use std::collections::HashMap;
use std::fs;
use std::fs::File;
use std::io::{BufRead, BufReader, BufWriter};
use std::net::SocketAddr;
use std::path::Path;
+use std::sync::Arc;
pub(crate) struct FilesystemLogger {
data_dir: String,
pub(crate) struct FilesystemLogger {
data_dir: String,
@@
-94,7
+95,9
@@
pub(crate) fn read_network(path: &Path, genesis_hash: BlockHash) -> NetworkGraph
NetworkGraph::new(genesis_hash)
}
NetworkGraph::new(genesis_hash)
}
-pub(crate) fn persist_scorer(path: &Path, scorer: &Scorer) -> std::io::Result<()> {
+pub(crate) fn persist_scorer(
+ path: &Path, scorer: &ProbabilisticScorer<Arc<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 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)?;
@@
-107,11
+110,16
@@
pub(crate) fn persist_scorer(path: &Path, scorer: &Scorer) -> std::io::Result<()
}
}
}
}
-pub(crate) fn read_scorer(path: &Path) -> Scorer {
+pub(crate) fn read_scorer(
+ path: &Path, graph: Arc<NetworkGraph>,
+) -> ProbabilisticScorer<Arc<NetworkGraph>> {
+ let params = ProbabilisticScoringParameters::default();
if let Ok(file) = File::open(path) {
if let Ok(file) = File::open(path) {
- if let Ok(scorer) = Scorer::read(&mut BufReader::new(file)) {
+ if let Ok(scorer) =
+ ProbabilisticScorer::read(&mut BufReader::new(file), (params, Arc::clone(&graph)))
+ {
return scorer;
}
}
return scorer;
}
}
-
Scorer::default(
)
+
ProbabilisticScorer::new(params, graph
)
}
}