mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +00:00
Update to Rust 1.59 and 2021 edition (#3038)
## Proposed Changes Lots of lint updates related to `flat_map`, `unwrap_or_else` and string patterns. I did a little more creative refactoring in the op pool, but otherwise followed Clippy's suggestions. ## Additional Info We need this PR to unblock CI.
This commit is contained in:
@@ -287,7 +287,7 @@ impl SlashingDatabase {
|
||||
) -> Result<i64, NotSafe> {
|
||||
let (validator_id, enabled) = self
|
||||
.get_validator_id_with_status(txn, public_key)?
|
||||
.ok_or_else(|| NotSafe::UnregisteredValidator(*public_key))?;
|
||||
.ok_or(NotSafe::UnregisteredValidator(*public_key))?;
|
||||
if enabled {
|
||||
Ok(validator_id)
|
||||
} else {
|
||||
@@ -303,7 +303,7 @@ impl SlashingDatabase {
|
||||
) -> Result<i64, NotSafe> {
|
||||
let (validator_id, _) = self
|
||||
.get_validator_id_with_status(txn, public_key)?
|
||||
.ok_or_else(|| NotSafe::UnregisteredValidator(*public_key))?;
|
||||
.ok_or(NotSafe::UnregisteredValidator(*public_key))?;
|
||||
Ok(validator_id)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user