projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consider dust exposure when assembling a route
[rust-lightning]
/
lightning
/
src
/
routing
/
gossip.rs
diff --git
a/lightning/src/routing/gossip.rs
b/lightning/src/routing/gossip.rs
index 90ead987e7c99c4c8079f57a4c9f91ea4485fb64..d11eaa6bc36d4221c481d544aa31b436c13f39d6 100644
(file)
--- a/
lightning/src/routing/gossip.rs
+++ b/
lightning/src/routing/gossip.rs
@@
-1056,7
+1056,7
@@
impl EffectiveCapacity {
}
/// Fees for routing via a given channel or a node
}
/// Fees for routing via a given channel or a node
-#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash)]
+#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash
, Ord, PartialOrd
)]
pub struct RoutingFees {
/// Flat routing fee in millisatoshis.
pub base_msat: u32,
pub struct RoutingFees {
/// Flat routing fee in millisatoshis.
pub base_msat: u32,
@@
-3388,31
+3388,28
@@
pub(crate) mod tests {
}
}
}
}
-#[cfg(
all(test, feature = "_bench_unstable")
)]
-mod benches {
+#[cfg(
ldk_bench
)]
+
pub
mod benches {
use super::*;
use super::*;
-
- use test::Bencher;
use std::io::Read;
use std::io::Read;
+ use criterion::{black_box, Criterion};
- #[bench]
- fn read_network_graph(bench: &mut Bencher) {
+ pub fn read_network_graph(bench: &mut Criterion) {
let logger = crate::util::test_utils::TestLogger::new();
let mut d = crate::routing::router::bench_utils::get_route_file().unwrap();
let mut v = Vec::new();
d.read_to_end(&mut v).unwrap();
let logger = crate::util::test_utils::TestLogger::new();
let mut d = crate::routing::router::bench_utils::get_route_file().unwrap();
let mut v = Vec::new();
d.read_to_end(&mut v).unwrap();
- bench.
iter(|| {
- let _ = NetworkGraph::read(&mut std::io::Cursor::new(&v), &logger).unwrap();
-
}
);
+ bench.
bench_function("read_network_graph", |b| b.iter(||
+ NetworkGraph::read(&mut std::io::Cursor::new(black_box(&v)), &logger).unwrap()
+
)
);
}
}
- #[bench]
- fn write_network_graph(bench: &mut Bencher) {
+ pub fn write_network_graph(bench: &mut Criterion) {
let logger = crate::util::test_utils::TestLogger::new();
let mut d = crate::routing::router::bench_utils::get_route_file().unwrap();
let net_graph = NetworkGraph::read(&mut d, &logger).unwrap();
let logger = crate::util::test_utils::TestLogger::new();
let mut d = crate::routing::router::bench_utils::get_route_file().unwrap();
let net_graph = NetworkGraph::read(&mut d, &logger).unwrap();
- bench.
iter(|| {
- let _ = net_graph.encode();
-
}
);
+ bench.
bench_function("write_network_graph", |b| b.iter(||
+ black_box(&net_graph).encode()
+
)
);
}
}
}
}