gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-19 21:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into tree-states

Browse Source
This commit is contained in:
Michael Sproul
2024-04-05 15:14:04 +11:00
parent 2cd0e609f5 b65daac907
commit 0d9fb5a755
455 changed files with 7906 additions and 5229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_node/http_api/tests/tests.rs
View File

@@ -628,7 +628,7 @@ impl ApiTester {
self
}
pub async fn test_beacon_blocks_finalized<T: EthSpec>(self) -> Self {
pub async fn test_beacon_blocks_finalized<E: EthSpec>(self) -> Self {
for block_id in self.interesting_block_ids() {
let block_root = block_id.root(&self.chain);
let block = block_id.full_block(&self.chain).await;
@@ -665,7 +665,7 @@ impl ApiTester {
self
}
pub async fn test_beacon_blinded_blocks_finalized<T: EthSpec>(self) -> Self {
pub async fn test_beacon_blinded_blocks_finalized<E: EthSpec>(self) -> Self {
for block_id in self.interesting_block_ids() {
let block_root = block_id.root(&self.chain);
let block = block_id.full_block(&self.chain).await;
@@ -1717,7 +1717,7 @@ impl ApiTester {
};
let expected = block.slot();
assert_eq!(result.header.beacon.slot, expected);
assert_eq!(result.get_slot(), expected);
self
}
@@ -1931,9 +1931,9 @@ impl ApiTester {
pub async fn test_get_config_spec(self) -> Self {
let result = self
.client
.get_config_spec::<ConfigAndPresetDeneb>()
.get_config_spec::<ConfigAndPresetElectra>()
.await
.map(|res| ConfigAndPreset::Deneb(res.data))
.map(|res| ConfigAndPreset::Electra(res.data))
.unwrap();
let expected = ConfigAndPreset::from_chain_spec::<E>(&self.chain.spec, None);
@@ -5528,11 +5528,11 @@ impl ApiTester {
}
}
async fn poll_events<S: Stream<Item = Result<EventKind<T>, eth2::Error>> + Unpin, T: EthSpec>(
async fn poll_events<S: Stream<Item = Result<EventKind<E>, eth2::Error>> + Unpin, E: EthSpec>(
stream: &mut S,
num_events: usize,
timeout: Duration,
) -> Vec<EventKind<T>> {
) -> Vec<EventKind<E>> {
let mut events = Vec::new();
let collect_stream_fut = async {