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

Simplify hashing in shuffling (#6483)

Browse Source 
* Simplify hashing in shuffling

* Fix benchmark deps

* Check benchmarks when linting
This commit is contained in:
Michael Sproul
2024-10-15 07:31:10 +11:00
committed by GitHub
parent 17711b720e
commit 2e440df4f1
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -95,7 +95,7 @@ resolver = "2"
edition = "2021" edition = "2021"
[workspace.dependencies] [workspace.dependencies]
alloy-primitives = "0.8" alloy-primitives = { version = "0.8", features = ["rlp", "getrandom"] }
alloy-rlp = "0.3.4" alloy-rlp = "0.3.4"
alloy-consensus = "0.3.0" alloy-consensus = "0.3.0"
anyhow = "1" anyhow = "1"

2
Makefile
View File

@@ -204,7 +204,7 @@ test-full: cargo-fmt test-release test-debug test-ef test-exec-engine
# Lints the code for bad style and potentially unsafe arithmetic using Clippy. # Lints the code for bad style and potentially unsafe arithmetic using Clippy.
# Clippy lints are opt-in per-crate for now. By default, everything is allowed except for performance and correctness lints. # Clippy lints are opt-in per-crate for now. By default, everything is allowed except for performance and correctness lints.
lint: lint:
cargo clippy --workspace --tests $(EXTRA_CLIPPY_OPTS) --features "$(TEST_FEATURES)" -- \ cargo clippy --workspace --benches --tests $(EXTRA_CLIPPY_OPTS) --features "$(TEST_FEATURES)" -- \
-D clippy::fn_to_numeric_cast_any \ -D clippy::fn_to_numeric_cast_any \
-D clippy::manual_let_else \ -D clippy::manual_let_else \
-D clippy::large_stack_frames \ -D clippy::large_stack_frames \

1
consensus/swap_or_not_shuffle/Cargo.toml
View File

@@ -18,4 +18,3 @@ fixed_bytes = { workspace = true }
[features] [features]
arbitrary = ["alloy-primitives/arbitrary"] arbitrary = ["alloy-primitives/arbitrary"]
getrandom = ["alloy-primitives/getrandom"]

2
consensus/swap_or_not_shuffle/src/shuffle_list.rs
View File

@@ -45,7 +45,7 @@ impl Buf {
/// Hash the entire buffer. /// Hash the entire buffer.
fn hash(&self) -> Hash256 { fn hash(&self) -> Hash256 {
Hash256::from_slice(&hash_fixed(&self.0)) Hash256::from(hash_fixed(&self.0))
} }
} }

2
consensus/types/Cargo.toml
View File

@@ -9,7 +9,7 @@ name = "benches"
harness = false harness = false
[dependencies] [dependencies]
alloy-primitives = { workspace = true, features = ["rlp", "getrandom"] } alloy-primitives = { workspace = true }
merkle_proof = { workspace = true } merkle_proof = { workspace = true }
bls = { workspace = true, features = ["arbitrary"] } bls = { workspace = true, features = ["arbitrary"] }
kzg = { workspace = true } kzg = { workspace = true }

2
consensus/types/benches/benches.rs
View File

@@ -78,7 +78,7 @@ fn all_benches(c: &mut Criterion) {
|| (bytes.clone(), spec.clone()), || (bytes.clone(), spec.clone()),
|(bytes, spec)| { |(bytes, spec)| {
let state: BeaconState<MainnetEthSpec> = let state: BeaconState<MainnetEthSpec> =
BeaconState::from_ssz_bytes(&bytes, &spec).expect("should decode"); BeaconState::from_ssz_bytes(bytes, spec).expect("should decode");
black_box(state) black_box(state)
}, },
BatchSize::SmallInput, BatchSize::SmallInput,

4
crypto/kzg/benches/benchmark.rs
View File

@@ -8,7 +8,7 @@ pub fn bench_init_context(c: &mut Criterion) {
.map_err(|e| format!("Unable to read trusted setup file: {}", e)) .map_err(|e| format!("Unable to read trusted setup file: {}", e))
.expect("should have trusted setup"); .expect("should have trusted setup");
c.bench_function(&format!("Initialize context rust_eth_kzg"), |b| { c.bench_function("Initialize context rust_eth_kzg", |b| {
b.iter(|| { b.iter(|| {
let trusted_setup = PeerDASTrustedSetup::from(&trusted_setup); let trusted_setup = PeerDASTrustedSetup::from(&trusted_setup);
DASContext::new( DASContext::new(
@@ -19,7 +19,7 @@ pub fn bench_init_context(c: &mut Criterion) {
) )
}) })
}); });
c.bench_function(&format!("Initialize context c-kzg (4844)"), |b| { c.bench_function("Initialize context c-kzg (4844)", |b| {
b.iter(|| { b.iter(|| {
let trusted_setup: TrustedSetup = let trusted_setup: TrustedSetup =
serde_json::from_reader(get_trusted_setup().as_slice()) serde_json::from_reader(get_trusted_setup().as_slice())