mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-07 08:52:54 +00:00
Electra: Remaining Consensus Data Structures (#5712)
* Attestation superstruct changes for EIP 7549 (#5644)
* update
* experiment
* superstruct changes
* revert
* superstruct changes
* fix tests
* indexed attestation
* indexed attestation superstruct
* updated TODOs
* `superstruct` the `AttesterSlashing` (#5636)
* `superstruct` Attester Fork Variants
* Push a little further
* Deal with Encode / Decode of AttesterSlashing
* not so sure about this..
* Stop Encode/Decode Bounds from Propagating Out
* Tons of Changes..
* More Conversions to AttestationRef
* Add AsReference trait (#15)
* Add AsReference trait
* Fix some snafus
* Got it Compiling! :D
* Got Tests Building
* Get beacon chain tests compiling
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Merge remote-tracking branch 'upstream/unstable' into electra_attestation_changes
* Make EF Tests Fork-Agnostic (#5713)
* Finish EF Test Fork Agnostic (#5714)
* Superstruct `AggregateAndProof` (#5715)
* Upgrade `superstruct` to `0.8.0`
* superstruct `AggregateAndProof`
* Merge remote-tracking branch 'sigp/unstable' into electra_attestation_changes
* cargo fmt
* Merge pull request #5726 from realbigsean/electra_attestation_changes
Merge unstable into Electra attestation changes
* EIP7549 `get_attestation_indices` (#5657)
* get attesting indices electra impl
* fmt
* get tests to pass
* fmt
* fix some beacon chain tests
* fmt
* fix slasher test
* fmt got me again
* fix more tests
* fix tests
* Some small changes (#5739)
* cargo fmt (#5740)
* Sketch op pool changes
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
* Get `electra_op_pool` up to date (#5756)
* fix get attesting indices (#5742)
* fix get attesting indices
* better errors
* fix compile
* only get committee index once
* Ef test fixes (#5753)
* attestation related ef test fixes
* delete commented out stuff
* Fix Aggregation Pool for Electra (#5754)
* Fix Aggregation Pool for Electra
* Remove Outdated Interface
* fix ssz (#5755)
---------
Co-authored-by: realbigsean <sean@sigmaprime.io>
* Revert "Get `electra_op_pool` up to date (#5756)" (#5757)
This reverts commit ab9e58aa3d.
* Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into electra_op_pool
* Compute on chain aggregate impl (#5752)
* add compute_on_chain_agg impl to op pool changes
* fmt
* get op pool tests to pass
* update the naive agg pool interface (#5760)
* Fix bugs in cross-committee aggregation
* Add comment to max cover optimisation
* Fix assert
* Merge pull request #5749 from sigp/electra_op_pool
Optimise Electra op pool aggregation
* update committee offset
* Fix Electra Fork Choice Tests (#5764)
* Subscribe to the correct subnets for electra attestations (#5782)
* subscribe to the correct att subnets for electra
* subscribe to the correct att subnets for electra
* cargo fmt
* fix slashing handling
* Merge remote-tracking branch 'upstream/unstable'
* Send unagg attestation based on fork
* Publish all aggregates
* just one more check bro plz..
* Merge pull request #5832 from ethDreamer/electra_attestation_changes_merge_unstable
Merge `unstable` into `electra_attestation_changes`
* Merge pull request #5835 from realbigsean/fix-validator-logic
Fix validator logic
* Merge pull request #5816 from realbigsean/electra-attestation-slashing-handling
Electra slashing handling
* Electra attestation changes rm decode impl (#5856)
* Remove Crappy Decode impl for Attestation
* Remove Inefficient Attestation Decode impl
* Implement Schema Upgrade / Downgrade
* Update beacon_node/beacon_chain/src/schema_change/migration_schema_v20.rs
Co-authored-by: Michael Sproul <micsproul@gmail.com>
---------
Co-authored-by: Michael Sproul <micsproul@gmail.com>
* Fix failing attestation tests and misc electra attestation cleanup (#5810)
* - get attestation related beacon chain tests to pass
- observed attestations are now keyed off of data + committee index
- rename op pool attestationref to compactattestationref
- remove unwraps in agg pool and use options instead
- cherry pick some changes from ef-tests-electra
* cargo fmt
* fix failing test
* Revert dockerfile changes
* make committee_index return option
* function args shouldnt be a ref to attestation ref
* fmt
* fix dup imports
---------
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
* fix some todos (#5817)
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* add consolidations to merkle calc for inclusion proof
* Remove Duplicate KZG Commitment Merkle Proof Code (#5874)
* Remove Duplicate KZG Commitment Merkle Proof Code
* s/tree_lists/fields/
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* fix compile
* Fix slasher tests (#5906)
* Fix electra tests
* Add electra attestations to double vote tests
* Update superstruct to 0.8
* Merge remote-tracking branch 'origin/unstable' into electra_attestation_changes
* Small cleanup in slasher tests
* Clean up Electra observed aggregates (#5929)
* Use consistent key in observed_attestations
* Remove unwraps from observed aggregates
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* De-dup attestation constructor logic
* Remove unwraps in Attestation construction
* Dedup match_attestation_data
* Remove outdated TODO
* Use ForkName Ord in fork-choice tests
* Use ForkName Ord in BeaconBlockBody
* Make to_electra not fallible
* Remove TestRandom impl for IndexedAttestation
* Remove IndexedAttestation faulty Decode impl
* Drop TestRandom impl
* Add PendingAttestationInElectra
* Indexed att on disk (#35)
* indexed att on disk
* fix lints
* Update slasher/src/migrate.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
---------
Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com>
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* add electra fork enabled fn to ForkName impl (#36)
* add electra fork enabled fn to ForkName impl
* remove inadvertent file
* Update common/eth2/src/types.rs
Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
* Dedup attestation constructor logic in attester cache
* Use if let Ok for committee_bits
* Dedup Attestation constructor code
* Diff reduction in tests
* Fix beacon_chain tests
* Diff reduction
* Use Ord for ForkName in pubsub
* Resolve into_attestation_and_indices todo
* Remove stale TODO
* Fix beacon_chain tests
* Test spec invariant
* Use electra_enabled in pubsub
* Remove get_indexed_attestation_from_signed_aggregate
* Use ok_or instead of if let else
* committees are sorted
* remove dup method `get_indexed_attestation_from_committees`
* Merge pull request #5940 from dapplion/electra_attestation_changes_lionreview
Electra attestations #5712 review
* update default persisted op pool deserialization
* ensure aggregate and proof uses serde untagged on ref
* Fork aware ssz static attestation tests
* Electra attestation changes from Lions review (#5971)
* dedup/cleanup and remove unneeded hashset use
* remove irrelevant TODOs
* Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes
* Electra attestation changes sean review (#5972)
* instantiate empty bitlist in unreachable code
* clean up error conversion
* fork enabled bool cleanup
* remove a couple todos
* return bools instead of options in `aggregate` and use the result
* delete commented out code
* use map macros in simple transformations
* remove signers_disjoint_from
* get ef tests compiling
* get ef tests compiling
* update intentionally excluded files
* Avoid changing slasher schema for Electra
* Delete slasher schema v4
* Fix clippy
* Fix compilation of beacon_chain tests
* Update database.rs
* Add electra lightclient types
* Update slasher/src/database.rs
* fix imports
* Merge pull request #5980 from dapplion/electra-lightclient
Add electra lightclient types
* Merge pull request #5975 from michaelsproul/electra-slasher-no-migration
Avoid changing slasher schema for Electra
* Update beacon_node/beacon_chain/src/attestation_verification.rs
* Update beacon_node/beacon_chain/src/attestation_verification.rs
This commit is contained in:
ethDreamer
@@ -5,7 +5,10 @@ use maplit::hashset;
|
||||
use rayon::prelude::*;
|
||||
use slasher::{
|
||||
config::DEFAULT_CHUNK_SIZE,
|
||||
test_utils::{att_slashing, indexed_att, slashed_validators_from_slashings, E},
|
||||
test_utils::{
|
||||
att_slashing, chain_spec, indexed_att, indexed_att_electra,
|
||||
slashed_validators_from_slashings, E,
|
||||
},
|
||||
Config, Slasher,
|
||||
};
|
||||
use std::collections::HashSet;
|
||||
@@ -15,23 +18,35 @@ use types::{AttesterSlashing, Epoch, IndexedAttestation};
|
||||
#[test]
|
||||
fn double_vote_single_val() {
|
||||
let v = vec![99];
|
||||
let att1 = indexed_att(&v, 0, 1, 0);
|
||||
let att2 = indexed_att(&v, 0, 1, 1);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v, 0, 1, 0), indexed_att(&v, 0, 1, 1)),
|
||||
(
|
||||
indexed_att_electra(&v, 0, 1, 0),
|
||||
indexed_att_electra(&v, 0, 1, 1),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn double_vote_multi_vals() {
|
||||
let v = vec![0, 1, 2];
|
||||
let att1 = indexed_att(&v, 0, 1, 0);
|
||||
let att2 = indexed_att(&v, 0, 1, 1);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v, 0, 1, 0), indexed_att(&v, 0, 1, 1)),
|
||||
(
|
||||
indexed_att_electra(&v, 0, 1, 0),
|
||||
indexed_att_electra(&v, 0, 1, 1),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
// A subset of validators double vote.
|
||||
@@ -39,12 +54,18 @@ fn double_vote_multi_vals() {
|
||||
fn double_vote_some_vals() {
|
||||
let v1 = vec![0, 1, 2, 3, 4, 5, 6];
|
||||
let v2 = vec![0, 2, 4, 6];
|
||||
let att1 = indexed_att(v1, 0, 1, 0);
|
||||
let att2 = indexed_att(v2, 0, 1, 1);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v1, 0, 1, 0), indexed_att(&v2, 0, 1, 1)),
|
||||
(
|
||||
indexed_att_electra(&v1, 0, 1, 0),
|
||||
indexed_att_electra(&v2, 0, 1, 1),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
// A subset of validators double vote, others vote twice for the same thing.
|
||||
@@ -53,13 +74,23 @@ fn double_vote_some_vals_repeat() {
|
||||
let v1 = vec![0, 1, 2, 3, 4, 5, 6];
|
||||
let v2 = vec![0, 2, 4, 6];
|
||||
let v3 = vec![1, 3, 5];
|
||||
let att1 = indexed_att(v1, 0, 1, 0);
|
||||
let att2 = indexed_att(v2, 0, 1, 1);
|
||||
let att3 = indexed_att(v3, 0, 1, 0);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2, att3];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
for (att1, att2, att3) in [
|
||||
(
|
||||
indexed_att(&v1, 0, 1, 0),
|
||||
indexed_att(&v2, 0, 1, 1),
|
||||
indexed_att(&v3, 0, 1, 0),
|
||||
),
|
||||
(
|
||||
indexed_att_electra(&v1, 0, 1, 0),
|
||||
indexed_att_electra(&v2, 0, 1, 1),
|
||||
indexed_att_electra(&v3, 0, 1, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2, att3];
|
||||
slasher_test_indiv(&attestations, &slashings, 1);
|
||||
slasher_test_indiv(&attestations, &slashings, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
// Nobody double votes, nobody gets slashed.
|
||||
@@ -67,11 +98,17 @@ fn double_vote_some_vals_repeat() {
|
||||
fn no_double_vote_same_target() {
|
||||
let v1 = vec![0, 1, 2, 3, 4, 5, 6];
|
||||
let v2 = vec![0, 1, 2, 3, 4, 5, 7, 8];
|
||||
let att1 = indexed_att(v1, 0, 1, 0);
|
||||
let att2 = indexed_att(v2, 0, 1, 0);
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1000);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v1, 0, 1, 0), indexed_att(&v2, 0, 1, 0)),
|
||||
(
|
||||
indexed_att_electra(&v1, 0, 1, 0),
|
||||
indexed_att_electra(&v2, 0, 1, 0),
|
||||
),
|
||||
] {
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
// Two groups votes for different things, no slashings.
|
||||
@@ -79,73 +116,133 @@ fn no_double_vote_same_target() {
|
||||
fn no_double_vote_distinct_vals() {
|
||||
let v1 = vec![0, 1, 2, 3];
|
||||
let v2 = vec![4, 5, 6, 7];
|
||||
let att1 = indexed_att(v1, 0, 1, 0);
|
||||
let att2 = indexed_att(v2, 0, 1, 1);
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1000);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v1, 0, 1, 0), indexed_att(&v2, 0, 1, 0)),
|
||||
(
|
||||
indexed_att_electra(&v1, 0, 1, 0),
|
||||
indexed_att_electra(&v2, 0, 1, 1),
|
||||
),
|
||||
] {
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_double_vote_repeated() {
|
||||
let v = vec![0, 1, 2, 3, 4];
|
||||
let att1 = indexed_att(v, 0, 1, 0);
|
||||
let att2 = att1.clone();
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_batch(&attestations, &hashset! {}, 1);
|
||||
parallel_slasher_test(&attestations, hashset! {}, 1);
|
||||
for att1 in [indexed_att(&v, 0, 1, 0), indexed_att_electra(&v, 0, 1, 0)] {
|
||||
let att2 = att1.clone();
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &hashset! {}, 1);
|
||||
slasher_test_batch(&attestations, &hashset! {}, 1);
|
||||
parallel_slasher_test(&attestations, hashset! {}, 1);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn surrounds_existing_single_val_single_chunk() {
|
||||
let v = vec![0];
|
||||
let att1 = indexed_att(&v, 1, 2, 0);
|
||||
let att2 = indexed_att(&v, 0, 3, 0);
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
slasher_test_indiv(&[att1, att2], &slashings, 3);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v, 1, 2, 0), indexed_att(&v, 0, 3, 0)),
|
||||
(indexed_att(&v, 1, 2, 0), indexed_att_electra(&v, 0, 3, 0)),
|
||||
(
|
||||
indexed_att_electra(&v, 1, 2, 0),
|
||||
indexed_att_electra(&v, 0, 3, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
slasher_test_indiv(&[att1, att2], &slashings, 3);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn surrounds_existing_multi_vals_single_chunk() {
|
||||
let validators = vec![0, 16, 1024, 300_000, 300_001];
|
||||
let att1 = indexed_att(validators.clone(), 1, 2, 0);
|
||||
let att2 = indexed_att(validators, 0, 3, 0);
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
slasher_test_indiv(&[att1, att2], &slashings, 3);
|
||||
for (att1, att2) in [
|
||||
(
|
||||
indexed_att(&validators, 1, 2, 0),
|
||||
indexed_att(&validators, 0, 3, 0),
|
||||
),
|
||||
(
|
||||
indexed_att(&validators, 1, 2, 0),
|
||||
indexed_att_electra(&validators, 0, 3, 0),
|
||||
),
|
||||
(
|
||||
indexed_att_electra(&validators, 1, 2, 0),
|
||||
indexed_att_electra(&validators, 0, 3, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
slasher_test_indiv(&[att1, att2], &slashings, 3);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn surrounds_existing_many_chunks() {
|
||||
let v = vec![0];
|
||||
let chunk_size = DEFAULT_CHUNK_SIZE as u64;
|
||||
let att1 = indexed_att(&v, 3 * chunk_size, 3 * chunk_size + 1, 0);
|
||||
let att2 = indexed_att(&v, 0, 3 * chunk_size + 2, 0);
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 4 * chunk_size);
|
||||
for (att1, att2) in [
|
||||
(
|
||||
indexed_att(&v, 3 * chunk_size, 3 * chunk_size + 1, 0),
|
||||
indexed_att(&v, 0, 3 * chunk_size + 2, 0),
|
||||
),
|
||||
(
|
||||
indexed_att(&v, 3 * chunk_size, 3 * chunk_size + 1, 0),
|
||||
indexed_att_electra(&v, 0, 3 * chunk_size + 2, 0),
|
||||
),
|
||||
(
|
||||
indexed_att_electra(&v, 3 * chunk_size, 3 * chunk_size + 1, 0),
|
||||
indexed_att_electra(&v, 0, 3 * chunk_size + 2, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att2, &att1)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 4 * chunk_size);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn surrounded_by_single_val_single_chunk() {
|
||||
let v = vec![0];
|
||||
let att1 = indexed_att(&v, 0, 15, 0);
|
||||
let att2 = indexed_att(&v, 1, 14, 0);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 15);
|
||||
for (att1, att2) in [
|
||||
(indexed_att(&v, 0, 15, 0), indexed_att(&v, 1, 14, 0)),
|
||||
(indexed_att(&v, 0, 15, 0), indexed_att_electra(&v, 1, 14, 0)),
|
||||
(
|
||||
indexed_att_electra(&v, 0, 15, 0),
|
||||
indexed_att_electra(&v, 1, 14, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 15);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn surrounded_by_single_val_multi_chunk() {
|
||||
let v = vec![0];
|
||||
let chunk_size = DEFAULT_CHUNK_SIZE as u64;
|
||||
let att1 = indexed_att(&v, 0, 3 * chunk_size, 0);
|
||||
let att2 = indexed_att(&v, chunk_size, chunk_size + 1, 0);
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 3 * chunk_size);
|
||||
slasher_test_indiv(&attestations, &slashings, 4 * chunk_size);
|
||||
for (att1, att2) in [
|
||||
(
|
||||
indexed_att(&v, 0, 3 * chunk_size, 0),
|
||||
indexed_att(&v, chunk_size, chunk_size + 1, 0),
|
||||
),
|
||||
(
|
||||
indexed_att(&v, 0, 3 * chunk_size, 0),
|
||||
indexed_att_electra(&v, chunk_size, chunk_size + 1, 0),
|
||||
),
|
||||
(
|
||||
indexed_att_electra(&v, 0, 3 * chunk_size, 0),
|
||||
indexed_att_electra(&v, chunk_size, chunk_size + 1, 0),
|
||||
),
|
||||
] {
|
||||
let slashings = hashset![att_slashing(&att1, &att2)];
|
||||
let attestations = vec![att1, att2];
|
||||
slasher_test_indiv(&attestations, &slashings, 3 * chunk_size);
|
||||
slasher_test_indiv(&attestations, &slashings, 4 * chunk_size);
|
||||
}
|
||||
}
|
||||
|
||||
// Process each attestation individually, and confirm that the slashings produced are as expected.
|
||||
@@ -174,7 +271,8 @@ fn slasher_test(
|
||||
) {
|
||||
let tempdir = tempdir().unwrap();
|
||||
let config = Config::new(tempdir.path().into());
|
||||
let slasher = Slasher::open(config, test_logger()).unwrap();
|
||||
let spec = chain_spec();
|
||||
let slasher = Slasher::open(config, spec, test_logger()).unwrap();
|
||||
let current_epoch = Epoch::new(current_epoch);
|
||||
|
||||
for (i, attestation) in attestations.iter().enumerate() {
|
||||
@@ -203,7 +301,8 @@ fn parallel_slasher_test(
|
||||
) {
|
||||
let tempdir = tempdir().unwrap();
|
||||
let config = Config::new(tempdir.path().into());
|
||||
let slasher = Slasher::open(config, test_logger()).unwrap();
|
||||
let spec = chain_spec();
|
||||
let slasher = Slasher::open(config, spec, test_logger()).unwrap();
|
||||
let current_epoch = Epoch::new(current_epoch);
|
||||
|
||||
attestations
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
use logging::test_logger;
|
||||
use slasher::{
|
||||
test_utils::{block as test_block, E},
|
||||
test_utils::{block as test_block, chain_spec, E},
|
||||
Config, Slasher,
|
||||
};
|
||||
use tempfile::tempdir;
|
||||
@@ -12,7 +12,8 @@ use types::{Epoch, EthSpec};
|
||||
fn empty_pruning() {
|
||||
let tempdir = tempdir().unwrap();
|
||||
let config = Config::new(tempdir.path().into());
|
||||
let slasher = Slasher::<E>::open(config, test_logger()).unwrap();
|
||||
let spec = chain_spec();
|
||||
let slasher = Slasher::<E>::open(config, spec, test_logger()).unwrap();
|
||||
slasher.prune_database(Epoch::new(0)).unwrap();
|
||||
}
|
||||
|
||||
@@ -24,8 +25,9 @@ fn block_pruning() {
|
||||
let mut config = Config::new(tempdir.path().into());
|
||||
config.chunk_size = 2;
|
||||
config.history_length = 2;
|
||||
let spec = chain_spec();
|
||||
|
||||
let slasher = Slasher::<E>::open(config.clone(), test_logger()).unwrap();
|
||||
let slasher = Slasher::<E>::open(config.clone(), spec, test_logger()).unwrap();
|
||||
let current_epoch = Epoch::from(2 * config.history_length);
|
||||
|
||||
// Pruning the empty database should be safe.
|
||||
|
||||
@@ -4,7 +4,7 @@ use logging::test_logger;
|
||||
use rand::prelude::*;
|
||||
use slasher::{
|
||||
test_utils::{
|
||||
block, indexed_att, slashed_validators_from_attestations,
|
||||
block, chain_spec, indexed_att, slashed_validators_from_attestations,
|
||||
slashed_validators_from_slashings, E,
|
||||
},
|
||||
Config, Slasher,
|
||||
@@ -49,7 +49,9 @@ fn random_test(seed: u64, test_config: TestConfig) {
|
||||
config.chunk_size = 1 << chunk_size_exponent;
|
||||
config.history_length = 1 << rng.gen_range(chunk_size_exponent..chunk_size_exponent + 3);
|
||||
|
||||
let slasher = Slasher::<E>::open(config.clone(), test_logger()).unwrap();
|
||||
let spec = chain_spec();
|
||||
|
||||
let slasher = Slasher::<E>::open(config.clone(), spec, test_logger()).unwrap();
|
||||
|
||||
let validators = (0..num_validators as u64).collect::<Vec<u64>>();
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#![cfg(any(feature = "mdbx", feature = "lmdb"))]
|
||||
|
||||
use logging::test_logger;
|
||||
use slasher::{test_utils::indexed_att, Config, Slasher};
|
||||
use slasher::{
|
||||
test_utils::{chain_spec, indexed_att},
|
||||
Config, Slasher,
|
||||
};
|
||||
use tempfile::tempdir;
|
||||
use types::Epoch;
|
||||
|
||||
@@ -9,11 +12,12 @@ use types::Epoch;
|
||||
fn attestation_pruning_empty_wrap_around() {
|
||||
let tempdir = tempdir().unwrap();
|
||||
let mut config = Config::new(tempdir.path().into());
|
||||
let spec = chain_spec();
|
||||
config.validator_chunk_size = 1;
|
||||
config.chunk_size = 16;
|
||||
config.history_length = 16;
|
||||
|
||||
let slasher = Slasher::open(config.clone(), test_logger()).unwrap();
|
||||
let slasher = Slasher::open(config.clone(), spec, test_logger()).unwrap();
|
||||
|
||||
let v = vec![0];
|
||||
let history_length = config.history_length as u64;
|
||||
|
||||
Reference in New Issue
Block a user