gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-30 19:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of https://github.com/sigp/lighthouse into single_attestation

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-01-06 14:41:11 +07:00
parent 44d15a99f4 f51a292f77
commit 4700ef9798
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-suite.yml vendored
View File

@@ -350,7 +350,7 @@ jobs:
- name: Check formatting with cargo fmt - name: Check formatting with cargo fmt
run: make cargo-fmt run: make cargo-fmt
- name: Lint code for quality and style with Clippy - name: Lint code for quality and style with Clippy
run: make lint run: make lint-full
- name: Certify Cargo.lock freshness - name: Certify Cargo.lock freshness
run: git diff --exit-code Cargo.lock run: git diff --exit-code Cargo.lock
- name: Typecheck benchmark code without running it - name: Typecheck benchmark code without running it

6
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:
RUSTFLAGS="-C debug-assertions=no $(RUSTFLAGS)" cargo clippy --workspace --benches --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 \
@@ -220,6 +220,10 @@ lint:
lint-fix: lint-fix:
EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint EXTRA_CLIPPY_OPTS="--fix --allow-staged --allow-dirty" $(MAKE) lint
# Also run the lints on the optimized-only tests
lint-full:
RUSTFLAGS="-C debug-assertions=no $(RUSTFLAGS)" $(MAKE) lint
# Runs the makefile in the `ef_tests` repo. # Runs the makefile in the `ef_tests` repo.
# #
# May download and extract an archive of test vectors from the ethereum # May download and extract an archive of test vectors from the ethereum

10
beacon_node/lighthouse_network/gossipsub/src/behaviour.rs
View File

@@ -679,9 +679,15 @@ where
// Gossipsub peers // Gossipsub peers
None => { None => {
tracing::debug!(topic=%topic_hash, "Topic not in the mesh"); tracing::debug!(topic=%topic_hash, "Topic not in the mesh");
// `fanout_peers` is always non-empty if it's `Some`.
let fanout_peers = self
.fanout
.get(&topic_hash)
.map(|peers| if peers.is_empty() { None } else { Some(peers) })
.unwrap_or(None);
// If we have fanout peers add them to the map. // If we have fanout peers add them to the map.
if self.fanout.contains_key(&topic_hash) { if let Some(peers) = fanout_peers {
for peer in self.fanout.get(&topic_hash).expect("Topic must exist") { for peer in peers {
recipient_peers.insert(*peer); recipient_peers.insert(*peer);
} }
} else { } else {