Merge branch 'unstable' of github.com:sigp/lighthouse into simplify-r…

…pc-codec

Makefile

@@ -12,7 +12,6 @@ AARCH64_TAG = "aarch64-unknown-linux-gnu"
 BUILD_PATH_AARCH64 = "target/$(AARCH64_TAG)/release"
 
 PINNED_NIGHTLY ?= nightly
-CLIPPY_PINNED_NIGHTLY=nightly-2022-05-19
 
 # List of features to use when cross-compiling. Can be overridden via the environment.
 CROSS_FEATURES ?= gnosis,slasher-lmdb,slasher-mdbx,slasher-redb,jemalloc
@@ -222,13 +221,6 @@ lint:
 lint-fix:
 	EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint
 
-nightly-lint:
-	cp .github/custom/clippy.toml .
-	cargo +$(CLIPPY_PINNED_NIGHTLY) clippy --workspace --tests --release -- \
-		-A clippy::all \
-		-D clippy::disallowed_from_async
-	rm clippy.toml
-
 # Runs the makefile in the `ef_tests` repo.
 #
 # May download and extract an archive of test vectors from the ethereum

beacon_node/beacon_chain/Cargo.toml

@@ -5,6 +5,10 @@ authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com
 edition = { workspace = true }
 autotests = false # using a single test binary compiles faster
 
+[[bench]]
+name = "benches"
+harness = false
+
 [features]
 default = ["participation_metrics"]
 write_ssz_files = []  # Writes debugging .ssz files to /tmp during block processing.
@@ -16,6 +20,7 @@ test_backfill = []
 [dev-dependencies]
 maplit = { workspace = true }
 serde_json = { workspace = true }
+criterion = { workspace = true }
 
 [dependencies]
 bitvec = { workspace = true }

beacon_node/beacon_chain/benches/benches.rs

@@ -0,0 +1,66 @@
+use std::sync::Arc;
+
+use beacon_chain::kzg_utils::{blobs_to_data_column_sidecars, reconstruct_data_columns};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
+use bls::Signature;
+use eth2_network_config::TRUSTED_SETUP_BYTES;
+use kzg::{Kzg, KzgCommitment, TrustedSetup};
+use types::{
+    beacon_block_body::KzgCommitments, BeaconBlock, BeaconBlockDeneb, Blob, BlobsList, ChainSpec,
+    EmptyBlock, EthSpec, MainnetEthSpec, SignedBeaconBlock,
+};
+
+fn create_test_block_and_blobs<E: EthSpec>(
+    num_of_blobs: usize,
+    spec: &ChainSpec,
+) -> (SignedBeaconBlock<E>, BlobsList<E>) {
+    let mut block = BeaconBlock::Deneb(BeaconBlockDeneb::empty(spec));
+    let mut body = block.body_mut();
+    let blob_kzg_commitments = body.blob_kzg_commitments_mut().unwrap();
+    *blob_kzg_commitments =
+        KzgCommitments::<E>::new(vec![KzgCommitment::empty_for_testing(); num_of_blobs]).unwrap();
+
+    let signed_block = SignedBeaconBlock::from_block(block, Signature::empty());
+
+    let blobs = (0..num_of_blobs)
+        .map(|_| Blob::<E>::default())
+        .collect::<Vec<_>>()
+        .into();
+
+    (signed_block, blobs)
+}
+
+fn all_benches(c: &mut Criterion) {
+    type E = MainnetEthSpec;
+    let spec = Arc::new(E::default_spec());
+
+    let trusted_setup: TrustedSetup = serde_json::from_reader(TRUSTED_SETUP_BYTES)
+        .map_err(|e| format!("Unable to read trusted setup file: {}", e))
+        .expect("should have trusted setup");
+    let kzg = Arc::new(Kzg::new_from_trusted_setup(trusted_setup).expect("should create kzg"));
+
+    for blob_count in [1, 2, 3, 6] {
+        let kzg = kzg.clone();
+        let (signed_block, blob_sidecars) = create_test_block_and_blobs::<E>(blob_count, &spec);
+
+        let column_sidecars =
+            blobs_to_data_column_sidecars(&blob_sidecars, &signed_block, &kzg.clone(), &spec)
+                .unwrap();
+
+        let spec = spec.clone();
+
+        c.bench_function(&format!("reconstruct_{}", blob_count), |b| {
+            b.iter(|| {
+                black_box(reconstruct_data_columns(
+                    &kzg,
+                    &column_sidecars.iter().as_slice()[0..column_sidecars.len() / 2],
+                    spec.as_ref(),
+                ))
+            })
+        });
+    }
+}
+
+criterion_group!(benches, all_benches);
+criterion_main!(benches);