gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-21 05:44:44 +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-01-25 15:10:19 +11:00
parent 6262be7219 1be5253610
commit 262e5f22bc
91 changed files with 2255 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
consensus/fork_choice/tests/tests.rs
View File

@@ -323,8 +323,9 @@ impl ForkChoiceTest {
)
.unwrap();
let slot = self.harness.get_current_slot();
let (mut block_tuple, mut state) = self.harness.make_block(state, slot).await;
func(&mut block_tuple.0, &mut state);
let ((block_arc, _block_blobs), mut state) = self.harness.make_block(state, slot).await;
let mut block = (*block_arc).clone();
func(&mut block, &mut state);
let current_slot = self.harness.get_current_slot();
self.harness
.chain
@@ -332,8 +333,8 @@ impl ForkChoiceTest {
.fork_choice_write_lock()
.on_block(
current_slot,
block_tuple.0.message(),
block_tuple.0.canonical_root(),
block.message(),
block.canonical_root(),
Duration::from_secs(0),
&state,
PayloadVerificationStatus::Verified,
@@ -366,8 +367,9 @@ impl ForkChoiceTest {
)
.unwrap();
let slot = self.harness.get_current_slot();
let (mut block_tuple, mut state) = self.harness.make_block(state, slot).await;
mutation_func(&mut block_tuple.0, &mut state);
let ((block_arc, _block_blobs), mut state) = self.harness.make_block(state, slot).await;
let mut block = (*block_arc).clone();
mutation_func(&mut block, &mut state);
let current_slot = self.harness.get_current_slot();
let err = self
.harness
@@ -376,8 +378,8 @@ impl ForkChoiceTest {
.fork_choice_write_lock()
.on_block(
current_slot,
block_tuple.0.message(),
block_tuple.0.canonical_root(),
block.message(),
block.canonical_root(),
Duration::from_secs(0),
&state,
PayloadVerificationStatus::Verified,