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

Update to Rust 1.59 and 2021 edition (#3038)

Browse Source 
## 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:
Michael Sproul
2022-02-25 00:10:17 +00:00
parent c1df5d29cb
commit 5e1f8a8480
115 changed files with 173 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
beacon_node/operation_pool/src/lib.rs
View File

@@ -560,9 +560,8 @@ impl<T: EthSpec> OperationPool<T> {
pub fn get_all_attestations(&self) -> Vec<Attestation<T>> {
self.attestations
.read()
.iter()
.map(|(_, attns)| attns.iter().cloned())
.flatten()
.values()
.flat_map(|attns| attns.iter().cloned())
.collect()
}
@@ -575,10 +574,10 @@ impl<T: EthSpec> OperationPool<T> {
{
self.attestations
.read()
.iter()
.map(|(_, attns)| attns.iter().cloned())
.flatten()
.filter(filter)
.values()
.flat_map(|attns| attns.iter())
.filter(|attn| filter(*attn))
.cloned()
.collect()
}

15
beacon_node/operation_pool/src/persistence.rs
View File

@@ -97,20 +97,19 @@ impl<T: EthSpec> PersistedOperationPool<T> {
/// Reconstruct an `OperationPool`. Sets `sync_contributions` to its `Default` if `self` matches
/// `PersistedOperationPool::Base`.
pub fn into_operation_pool(self) -> Result<OperationPool<T>, OpPoolError> {
let attestations = RwLock::new(self.attestations().to_vec().into_iter().collect());
let attester_slashings =
RwLock::new(self.attester_slashings().to_vec().into_iter().collect());
let attestations = RwLock::new(self.attestations().iter().cloned().collect());
let attester_slashings = RwLock::new(self.attester_slashings().iter().cloned().collect());
let proposer_slashings = RwLock::new(
self.proposer_slashings()
.to_vec()
.into_iter()
.iter()
.cloned()
.map(|slashing| (slashing.signed_header_1.message.proposer_index, slashing))
.collect(),
);
let voluntary_exits = RwLock::new(
self.voluntary_exits()
.to_vec()
.into_iter()
.iter()
.cloned()
.map(|exit| (exit.message.validator_index, exit))
.collect(),
);
@@ -125,7 +124,7 @@ impl<T: EthSpec> PersistedOperationPool<T> {
},
PersistedOperationPool::Altair(_) => {
let sync_contributions =
RwLock::new(self.sync_contributions()?.to_vec().into_iter().collect());
RwLock::new(self.sync_contributions()?.iter().cloned().collect());
OperationPool {
attestations,