gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-15 02:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy, finish pruning tests

Browse Source
This commit is contained in:
Paul Hauner
2020-01-14 12:15:23 +11:00
parent cc7f8fe951
commit 6bb453fc27
3 changed files with 147 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
eth2/lmd_ghost/src/lib.rs
View File

@@ -156,6 +156,10 @@ impl ProtoArrayForkChoice {
let new_balances = justified_state_balances;
proto_array
.maybe_prune(finalized_epoch, finalized_root)
.map_err(|e| format!("find_head maybe_prune failed: {:?}", e))?;
let deltas = compute_deltas(
&proto_array.indices,
&mut votes,
@@ -164,9 +168,6 @@ impl ProtoArrayForkChoice {
)
.map_err(|e| format!("find_head compute_deltas failed: {:?}", e))?;
proto_array
.maybe_prune(finalized_epoch, finalized_root)
.map_err(|e| format!("find_head maybe_prune failed: {:?}", e))?;
proto_array
.apply_score_changes(deltas, justified_epoch)
.map_err(|e| format!("find_head apply_score_changes failed: {:?}", e))?;
@@ -189,6 +190,14 @@ impl ProtoArrayForkChoice {
.map_err(|e| format!("find_head maybe_prune failed: {:?}", e))
}
pub fn set_prune_threshold(&self, prune_threshold: usize) {
self.proto_array.write().prune_threshold = prune_threshold;
}
pub fn len(&self) -> usize {
self.proto_array.read().nodes.len()
}
fn latest_message(&self, validator_index: usize) -> Option<(Hash256, Slot)> {
unimplemented!()
}

956
eth2/lmd_ghost/src/proto_array.rs
View File

File diff suppressed because it is too large Load Diff

148
eth2/lmd_ghost/tests/test.rs
View File

@@ -8,19 +8,6 @@ fn get_hash(i: u64) -> Hash256 {
/// This tests does not use any validator votes, it just relies on hash-sorting to find the
/// head.
///
/// The following block graph is built and tested as each block is added (each block has the
/// hash set to the big-endian representation of its number shown here):
///
/// 0
/// / \
/// 2 1
/// | |
/// 4 3
/// |
/// 5 <--- justified epoch becomes 1 here, all above are 0.
/// |
/// 6
#[test]
fn no_votes() {
const VALIDATOR_COUNT: usize = 16;
@@ -284,6 +271,7 @@ fn no_votes() {
);
}
/// This test uses validator votes and tests weight assignment.
#[test]
fn votes() {
const VALIDATOR_COUNT: usize = 2;
@@ -564,7 +552,7 @@ fn votes() {
// /
// 5 <- justified epoch = 1
fork_choice
.process_block(get_hash(5), get_hash(4), Epoch::new(1), Epoch::new(0))
.process_block(get_hash(5), get_hash(4), Epoch::new(1), Epoch::new(1))
.expect("should process block");
// Ensure that 5 is filtered out and the head stays at 4.
@@ -644,13 +632,13 @@ fn votes() {
// /
// 9
fork_choice
.process_block(get_hash(7), get_hash(5), Epoch::new(1), Epoch::new(0))
.process_block(get_hash(7), get_hash(5), Epoch::new(1), Epoch::new(1))
.expect("should process block");
fork_choice
.process_block(get_hash(8), get_hash(7), Epoch::new(1), Epoch::new(0))
.process_block(get_hash(8), get_hash(7), Epoch::new(1), Epoch::new(1))
.expect("should process block");
fork_choice
.process_block(get_hash(9), get_hash(8), Epoch::new(1), Epoch::new(0))
.process_block(get_hash(9), get_hash(8), Epoch::new(1), Epoch::new(1))
.expect("should process block");
// Ensure that 6 is the head, even though 5 has all the votes. This is testing to ensure
@@ -710,8 +698,8 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
@@ -764,7 +752,7 @@ fn votes() {
// / \
// 9 10
fork_choice
.process_block(get_hash(10), get_hash(8), Epoch::new(1), Epoch::new(0))
.process_block(get_hash(10), get_hash(8), Epoch::new(1), Epoch::new(1))
.expect("should process block");
// Double-check the head is still 9 (no diagram this time)
@@ -773,8 +761,8 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
@@ -831,8 +819,8 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
@@ -857,8 +845,8 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
@@ -883,8 +871,8 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
@@ -897,6 +885,7 @@ fn votes() {
// Check the head is 9 again.
//
// (prior blocks ommitted)
// .
// .
// .
@@ -909,12 +898,111 @@ fn votes() {
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(0),
Hash256::zero(),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
get_hash(9),
"should find get_hash(9)"
);
// Set pruning to an unreachable value.
fork_choice.set_prune_threshold(usize::max_value());
// Run find-head to trigger a prune.
assert_eq!(
fork_choice
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
get_hash(9),
"should find get_hash(9)"
);
// Ensure that no pruning happened.
assert_eq!(fork_choice.len(), 11, "there should be 11 blocks");
// Set pruning to a value that will result in a prune.
fork_choice.set_prune_threshold(1);
// Run find-head to trigger a prune.
//
//
// 0
// / \
// 2 1
// |
// 3
// |
// 4
// -------pruned here ------
// 5 6
// |
// 7
// |
// 8
// / \
// head-> 9 10
assert_eq!(
fork_choice
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
get_hash(9),
"should find get_hash(9)"
);
// Ensure that pruning happened.
assert_eq!(fork_choice.len(), 6, "there should be 6 blocks");
// Add block 11
//
// 5 6
// |
// 7
// |
// 8
// / \
// 9 10
// |
// 11
fork_choice
.process_block(get_hash(11), get_hash(9), Epoch::new(1), Epoch::new(1))
.expect("should process block");
// Ensure the head is now 11
//
// 5 6
// |
// 7
// |
// 8
// / \
// 9 10
// |
// head-> 11
assert_eq!(
fork_choice
.find_head(
Epoch::new(1),
get_hash(5),
Epoch::new(1),
get_hash(5),
&balances
)
.expect("should find head"),
get_hash(11),
"should find get_hash(11)"
);
}