gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-07-05 13:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Rust Edition to 2024 (#7766)

Browse Source 
* #7749

Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
chonghe
2025-08-13 11:04:31 +08:00
committed by GitHub
parent bd6b8b6a65
commit 522bd9e9c6
468 changed files with 3594 additions and 3396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
beacon_node/beacon_chain/src/summaries_dag.rs
View File

@@ -1,7 +1,7 @@
use itertools::Itertools;
use std::{
cmp::Ordering,
collections::{btree_map::Entry, BTreeMap, HashMap},
collections::{BTreeMap, HashMap, btree_map::Entry},
};
use store::HotStateSummary;
use types::{Hash256, Slot};
@@ -88,7 +88,7 @@ impl StateSummariesDAG {
block_root: summary.latest_block_root,
existing_state_summary: (summary.slot, state_root).into(),
new_state_summary: (*existing.key(), existing.get().0),
})
});
}
}
@@ -136,7 +136,7 @@ impl StateSummariesDAG {
block_root: summary.latest_block_root,
existing_state_summary: (summary.slot, *state_root).into(),
new_state_summary: (*existing.key(), *existing.get().0),
})
});
}
}
}
@@ -288,7 +288,7 @@ impl StateSummariesDAG {
ancestor_slot,
state_root,
state_slot: summary.slot,
})
});
}
Ordering::Equal => {
return Ok(state_root);
@@ -322,15 +322,15 @@ impl StateSummariesDAG {
loop {
if let Some(summary) = self.state_summaries_by_state_root.get(&state_root) {
// Detect cycles, including the case where `previous_state_root == state_root`.
if let Some(last_slot) = last_slot {
if summary.slot >= last_slot {
return Err(Error::CircularAncestorChain {
state_root,
previous_state_root: summary.previous_state_root,
slot: summary.slot,
last_slot,
});
}
if let Some(last_slot) = last_slot
&& summary.slot >= last_slot
{
return Err(Error::CircularAncestorChain {
state_root,
previous_state_root: summary.previous_state_root,
slot: summary.slot,
last_slot,
});
}
ancestors.push((state_root, summary.slot));