gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-22 22:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new clippy lints (#2036)

Browse Source 
## Issue Addressed

NA

## Proposed Changes

Fixes new clippy lints in the whole project (mainly [manual_strip](https://rust-lang.github.io/rust-clippy/master/index.html#manual_strip) and [unnecessary_lazy_evaluations](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations)). Furthermore, removes `to_string()` calls on literals when used with the `?`-operator.
This commit is contained in:
blacktemplar
2020-12-03 01:10:26 +00:00
parent d3f0a21436
commit d8cda2d86e
71 changed files with 314 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slasher/src/array.rs
View File

@@ -47,7 +47,7 @@ impl Chunk {
self.data
.get(cell_index)
.map(|distance| epoch + u64::from(*distance))
.ok_or_else(|| Error::ChunkIndexOutOfBounds(cell_index))
.ok_or(Error::ChunkIndexOutOfBounds(cell_index))
}
pub fn set_target(
@@ -75,7 +75,7 @@ impl Chunk {
let cell = self
.data
.get_mut(cell_index)
.ok_or_else(|| Error::ChunkIndexOutOfBounds(cell_index))?;
.ok_or(Error::ChunkIndexOutOfBounds(cell_index))?;
*cell = target_distance;
Ok(())
}

10
slasher/src/database.rs
View File

@@ -342,7 +342,7 @@ impl<E: EthSpec> SlasherDB<E> {
let bytes = txn
.get(self.indexed_attestation_db, &key)
.optional()?
.ok_or_else(|| Error::MissingIndexedAttestation {
.ok_or(Error::MissingIndexedAttestation {
root: indexed_attestation_hash,
})?;
Ok(IndexedAttestation::from_ssz_bytes(bytes)?)
@@ -400,7 +400,7 @@ impl<E: EthSpec> SlasherDB<E> {
) -> Result<IndexedAttestation<E>, Error> {
let record = self
.get_attester_record(txn, validator_index, target_epoch)?
.ok_or_else(|| Error::MissingAttesterRecord {
.ok_or(Error::MissingAttesterRecord {
validator_index,
target_epoch,
})?;
@@ -512,7 +512,7 @@ impl<E: EthSpec> SlasherDB<E> {
let key_bytes = cursor
.get(None, None, lmdb_sys::MDB_GET_CURRENT)?
.0
.ok_or_else(|| Error::MissingProposerKey)?;
.ok_or(Error::MissingProposerKey)?;
let (slot, _) = ProposerKey::parse(key_bytes)?;
if slot < min_slot {
@@ -558,7 +558,7 @@ impl<E: EthSpec> SlasherDB<E> {
let key_bytes = cursor
.get(None, None, lmdb_sys::MDB_GET_CURRENT)?
.0
.ok_or_else(|| Error::MissingAttesterKey)?;
.ok_or(Error::MissingAttesterKey)?;
let (target_epoch, _) = AttesterKey::parse(key_bytes)?;
@@ -605,7 +605,7 @@ impl<E: EthSpec> SlasherDB<E> {
let key_bytes = cursor
.get(None, None, lmdb_sys::MDB_GET_CURRENT)?
.0
.ok_or_else(|| Error::MissingAttesterKey)?;
.ok_or(Error::MissingAttesterKey)?;
let (target_epoch, _) = IndexedAttestationKey::parse(key_bytes)?;