X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Frouting%2Frouter.rs;h=dc2f8fd1196a1848af7390af2bc7642c9265f1df;hb=de1aca5ca27ae372a4b240489ccdd49a8f4dc436;hp=a21cf79a144dfecf47603da633f887992b068d5b;hpb=d29ae1826e1d3fe39f65474532f8788413ce8737;p=rust-lightning diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs index a21cf79a..dc2f8fd1 100644 --- a/lightning/src/routing/router.rs +++ b/lightning/src/routing/router.rs @@ -455,7 +455,7 @@ struct PathBuildingHop<'a> { /// decrease as well. Thus, we have to explicitly track which nodes have been processed and /// avoid processing them again. was_processed: bool, - #[cfg(any(test, feature = "fuzztarget"))] + #[cfg(all(not(feature = "_bench_unstable"), any(test, feature = "fuzztarget")))] // In tests, we apply further sanity checks on cases where we skip nodes we already processed // to ensure it is specifically in cases where the fee has gone down because of a decrease in // value_contribution_msat, which requires tracking it here. See comments below where it is @@ -896,14 +896,14 @@ where L::Target: Logger { path_htlc_minimum_msat, path_penalty_msat: u64::max_value(), was_processed: false, - #[cfg(any(test, feature = "fuzztarget"))] + #[cfg(all(not(feature = "_bench_unstable"), any(test, feature = "fuzztarget")))] value_contribution_msat, } }); #[allow(unused_mut)] // We only use the mut in cfg(test) let mut should_process = !old_entry.was_processed; - #[cfg(any(test, feature = "fuzztarget"))] + #[cfg(all(not(feature = "_bench_unstable"), any(test, feature = "fuzztarget")))] { // In test/fuzzing builds, we do extra checks to make sure the skipping // of already-seen nodes only happens in cases we expect (see below). @@ -992,13 +992,13 @@ where L::Target: Logger { old_entry.fee_msat = 0; // This value will be later filled with hop_use_fee_msat of the following channel old_entry.path_htlc_minimum_msat = path_htlc_minimum_msat; old_entry.path_penalty_msat = path_penalty_msat; - #[cfg(any(test, feature = "fuzztarget"))] + #[cfg(all(not(feature = "_bench_unstable"), any(test, feature = "fuzztarget")))] { old_entry.value_contribution_msat = value_contribution_msat; } did_add_update_path_to_src_node = true; } else if old_entry.was_processed && new_cost < old_cost { - #[cfg(any(test, feature = "fuzztarget"))] + #[cfg(all(not(feature = "_bench_unstable"), any(test, feature = "fuzztarget")))] { // If we're skipping processing a node which was previously // processed even though we found another path to it with a @@ -4976,7 +4976,7 @@ pub(crate) mod test_utils { } } -#[cfg(all(test, feature = "unstable", not(feature = "no-std")))] +#[cfg(all(test, feature = "_bench_unstable", not(feature = "no-std")))] mod benches { use super::*; use bitcoin::hashes::Hash;