Skip to content

Commit cef25c1

Browse files
committed
f No need for Result<NetworkGraph, Error>
1 parent ba8aebd commit cef25c1

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/io_utils.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::{Config, Error, FilesystemLogger, NetworkGraph, Scorer};
1+
use crate::{Config, FilesystemLogger, NetworkGraph, Scorer};
22

33
use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
44
use lightning::util::ser::ReadableArgs;
@@ -29,19 +29,17 @@ pub(crate) fn read_or_generate_seed_file(config: &Config) -> [u8; 32] {
2929
}
3030
}
3131

32-
pub(crate) fn read_network_graph(
33-
config: &Config, logger: Arc<FilesystemLogger>,
34-
) -> Result<NetworkGraph, Error> {
32+
pub(crate) fn read_network_graph(config: &Config, logger: Arc<FilesystemLogger>) -> NetworkGraph {
3533
let ldk_data_dir = format!("{}/ldk", config.storage_dir_path);
3634
let network_graph_path = format!("{}/network_graph", ldk_data_dir);
3735

3836
if let Ok(file) = fs::File::open(network_graph_path) {
3937
if let Ok(graph) = NetworkGraph::read(&mut BufReader::new(file), Arc::clone(&logger)) {
40-
return Ok(graph);
38+
return graph;
4139
}
4240
}
4341

44-
Ok(NetworkGraph::new(config.network, logger))
42+
NetworkGraph::new(config.network, logger)
4543
}
4644

4745
pub(crate) fn read_scorer(

src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,8 @@ impl Builder {
271271
));
272272

273273
// Initialize the network graph, scorer, and router
274-
let network_graph = Arc::new(
275-
io_utils::read_network_graph(config.as_ref(), Arc::clone(&logger))
276-
.expect("Failed to read the network graph"),
277-
);
274+
let network_graph =
275+
Arc::new(io_utils::read_network_graph(config.as_ref(), Arc::clone(&logger)));
278276
let scorer = Arc::new(Mutex::new(io_utils::read_scorer(
279277
config.as_ref(),
280278
Arc::clone(&network_graph),

0 commit comments

Comments
 (0)