projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consolidate conditional imports
[rust-lightning]
/
lightning
/
src
/
ln
/
outbound_payment.rs
diff --git
a/lightning/src/ln/outbound_payment.rs
b/lightning/src/ln/outbound_payment.rs
index 66c9ee62e5e8a9044a536da7dedc784a4a0154ae..b82cc436a114e224c266709c7fb6adfc06013eec 100644
(file)
--- a/
lightning/src/ln/outbound_payment.rs
+++ b/
lightning/src/ln/outbound_payment.rs
@@
-345,10
+345,10
@@
pub(crate) struct PaymentAttemptsUsingTime<T: Time> {
}
}
-#[cfg(not(any(not(feature = "std"), test)))]
-type ConfiguredTime = crate::util::time::MonotonicTime;
#[cfg(not(feature = "std"))]
type ConfiguredTime = crate::util::time::Eternity;
#[cfg(not(feature = "std"))]
type ConfiguredTime = crate::util::time::Eternity;
+#[cfg(all(feature = "std", not(test)))]
+type ConfiguredTime = crate::util::time::MonotonicTime;
#[cfg(all(feature = "std", test))]
type ConfiguredTime = SinceEpoch;
#[cfg(all(feature = "std", test))]
type ConfiguredTime = SinceEpoch;