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

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2025-11-04 10:36:08 -08:00
parent acac0503ed 0507eca7b4
commit 3d75238a6d
129 changed files with 2701 additions and 1640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
consensus/state_processing/src/per_block_processing.rs
View File

@@ -626,7 +626,12 @@ pub fn get_expected_withdrawals<E: EthSpec>(
.safe_rem(state.validators().len() as u64)?;
}
Ok((withdrawals.into(), processed_partial_withdrawals_count))
Ok((
withdrawals
.try_into()
.map_err(BlockProcessingError::SszTypesError)?,
processed_partial_withdrawals_count,
))
}
/// Apply withdrawals to the state.

24
consensus/state_processing/src/per_block_processing/tests.rs
View File

@@ -213,7 +213,7 @@ async fn valid_4_deposits() {
let mut state = harness.get_current_state();
let (deposits, state) = harness.make_deposits(&mut state, 4, None, None);
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -237,7 +237,7 @@ async fn invalid_deposit_deposit_count_too_big() {
let mut state = harness.get_current_state();
let (deposits, state) = harness.make_deposits(&mut state, 1, None, None);
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -269,7 +269,7 @@ async fn invalid_deposit_count_too_small() {
let mut state = harness.get_current_state();
let (deposits, state) = harness.make_deposits(&mut state, 1, None, None);
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -301,7 +301,7 @@ async fn invalid_deposit_bad_merkle_proof() {
let mut state = harness.get_current_state();
let (deposits, state) = harness.make_deposits(&mut state, 1, None, None);
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -336,7 +336,7 @@ async fn invalid_deposit_wrong_sig() {
let (deposits, state) =
harness.make_deposits(&mut state, 1, None, Some(SignatureBytes::empty()));
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -360,7 +360,7 @@ async fn invalid_deposit_invalid_pub_key() {
let (deposits, state) =
harness.make_deposits(&mut state, 1, Some(PublicKeyBytes::empty()), None);
let deposits = VariableList::from(deposits);
let deposits = VariableList::try_from(deposits).unwrap();
let mut head_block = harness
.chain
@@ -753,10 +753,12 @@ async fn invalid_attester_slashing_1_invalid() {
let mut attester_slashing = harness.make_attester_slashing(vec![1, 2]);
match &mut attester_slashing {
AttesterSlashing::Base(attester_slashing) => {
attester_slashing.attestation_1.attesting_indices = VariableList::from(vec![2, 1]);
attester_slashing.attestation_1.attesting_indices =
VariableList::try_from(vec![2, 1]).unwrap();
}
AttesterSlashing::Electra(attester_slashing) => {
attester_slashing.attestation_1.attesting_indices = VariableList::from(vec![2, 1]);
attester_slashing.attestation_1.attesting_indices =
VariableList::try_from(vec![2, 1]).unwrap();
}
}
@@ -791,10 +793,12 @@ async fn invalid_attester_slashing_2_invalid() {
let mut attester_slashing = harness.make_attester_slashing(vec![1, 2]);
match &mut attester_slashing {
AttesterSlashing::Base(attester_slashing) => {
attester_slashing.attestation_2.attesting_indices = VariableList::from(vec![2, 1]);
attester_slashing.attestation_2.attesting_indices =
VariableList::try_from(vec![2, 1]).unwrap();
}
AttesterSlashing::Electra(attester_slashing) => {
attester_slashing.attestation_2.attesting_indices = VariableList::from(vec![2, 1]);
attester_slashing.attestation_2.attesting_indices =
VariableList::try_from(vec![2, 1]).unwrap();
}
}