mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-21 13:54:44 +00:00
Merge branch 'expose-blst-internals' into into-anchor
# Conflicts: # Cargo.lock # Cargo.toml # account_manager/src/validator/create.rs # account_manager/src/validator/recover.rs # beacon_node/http_api/src/block_id.rs # beacon_node/http_api/src/lib.rs # consensus/types/src/payload.rs # validator_client/doppelganger_service/src/lib.rs # validator_client/http_metrics/Cargo.toml # validator_client/validator_services/src/preparation_service.rs
This commit is contained in:
@@ -1113,9 +1113,7 @@ fn max_or<T: Copy + Ord>(opt_x: Option<T>, y: T) -> T {
|
||||
///
|
||||
/// If prev is `None` and `new` is `Some` then `true` is returned.
|
||||
fn monotonic<T: PartialOrd>(new: Option<T>, prev: Option<T>) -> bool {
|
||||
new.map_or(false, |new_val| {
|
||||
prev.map_or(true, |prev_val| new_val >= prev_val)
|
||||
})
|
||||
new.is_some_and(|new_val| prev.map_or(true, |prev_val| new_val >= prev_val))
|
||||
}
|
||||
|
||||
/// The result of importing a single entry from an interchange file.
|
||||
|
||||
Reference in New Issue
Block a user