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

Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes

Browse Source
This commit is contained in:
Michael Sproul
2024-06-14 12:32:47 +10:00
parent d7f3c9583e a74098044a
commit d5aa2d8dfe
34 changed files with 92 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/beacon_chain/src/eth1_chain.rs
View File

@@ -685,7 +685,7 @@ mod test {
fn get_eth1_data(i: u64) -> Eth1Data {
Eth1Data {
block_hash: Hash256::from_low_u64_be(i),
deposit_root: Hash256::from_low_u64_be(u64::max_value() - i),
deposit_root: Hash256::from_low_u64_be(u64::MAX - i),
deposit_count: i,
}
}

2
beacon_node/beacon_chain/src/validator_monitor.rs
View File

@@ -2067,7 +2067,7 @@ pub fn timestamp_now() -> Duration {
}
fn u64_to_i64(n: impl Into<u64>) -> i64 {
i64::try_from(n.into()).unwrap_or(i64::max_value())
i64::try_from(n.into()).unwrap_or(i64::MAX)
}
/// Returns the delay between the start of `block.slot` and `seen_timestamp`.