Skip to content

Commit

Permalink
Add lockbud task to CI (#6470)
Browse files Browse the repository at this point in the history
* Add lockbud task to CI

* Allow unknown lint

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

* remove potential deadlock

* ignore tokio util crate

* Update image
  • Loading branch information
eserilev authored Oct 9, 2024
1 parent 71c5388 commit 352a9cf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ jobs:
done
echo "skip_ci=$SKIP_CI" >> $GITHUB_OUTPUT
lockbud:
name: lockbud
runs-on: ubuntu-latest
container:
image: sigmaprime/lockbud:latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install dependencies
run: apt update && apt install -y cmake
- name: Generate code coverage
run: |
cargo lockbud -k deadlock -b -l tokio_util
target-branch-check:
name: target-branch-check
runs-on: ubuntu-latest
Expand Down Expand Up @@ -433,6 +447,7 @@ jobs:
'cargo-udeps',
'compile-with-beta-compiler',
'cli-check',
'lockbud',
]
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion beacon_node/eth1/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,11 @@ impl Service {

/// Returns the number of deposits with valid signatures that have been observed.
pub fn get_valid_signature_count(&self) -> Option<usize> {
let highest_safe_block = self.highest_safe_block()?;
self.deposits()
.read()
.cache
.get_valid_signature_count(self.highest_safe_block()?)
.get_valid_signature_count(highest_safe_block)
}

/// Returns the number of deposits with valid signatures that have been observed, without
Expand Down
2 changes: 2 additions & 0 deletions consensus/state_processing/src/consensus_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ impl<E: EthSpec> ConsensusContext<E> {
}
}

#[allow(unknown_lints)]
#[allow(elided_named_lifetimes)]
pub fn get_indexed_attestation<'a>(
&'a mut self,
state: &BeaconState<E>,
Expand Down

0 comments on commit 352a9cf

Please sign in to comment.