cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Ensure fork_choice tests pass under v0.5.0

Browse Source
This commit is contained in:
Paul Hauner 2019-03-17 18:56:05 +11:00
parent 6df5eee7f4
commit df3f8df7bd
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth2/fork_choice/src/longest_chain.rs
View File

@ -34,7 +34,7 @@ impl<T: ClientDB + Sized> ForkChoice for LongestChain<T> {
) -> Result<(), ForkChoiceError> { ) -> Result<(), ForkChoiceError> {
// add the block hash to head_block_hashes removing the parent if it exists // add the block hash to head_block_hashes removing the parent if it exists
self.head_block_hashes self.head_block_hashes
.retain(|hash| *hash != block.parent_root); .retain(|hash| *hash != block.previous_block_root);
self.head_block_hashes.push(*block_hash); self.head_block_hashes.push(*block_hash);
Ok(()) Ok(())
} }

10
eth2/fork_choice/tests/tests.rs
View File

@ -90,6 +90,8 @@ fn test_yaml_vectors(
let randao_reveal = Signature::empty_signature(); let randao_reveal = Signature::empty_signature();
let signature = Signature::empty_signature(); let signature = Signature::empty_signature();
let body = BeaconBlockBody { let body = BeaconBlockBody {
eth1_data,
randao_reveal,
proposer_slashings: vec![], proposer_slashings: vec![],
attester_slashings: vec![], attester_slashings: vec![],
attestations: vec![], attestations: vec![],
@ -117,14 +119,14 @@ fn test_yaml_vectors(
// default params for genesis // default params for genesis
let block_hash = id_to_hash(&block_id); let block_hash = id_to_hash(&block_id);
let mut slot = spec.genesis_slot; let mut slot = spec.genesis_slot;
let parent_root = id_to_hash(&parent_id); let previous_block_root = id_to_hash(&parent_id);
// set the slot and parent based off the YAML. Start with genesis; // set the slot and parent based off the YAML. Start with genesis;
// if not the genesis, update slot // if not the genesis, update slot
if parent_id != block_id { if parent_id != block_id {
// find parent slot // find parent slot
slot = *(block_slot slot = *(block_slot
.get(&parent_root) .get(&previous_block_root)
.expect("Parent should have a slot number")) .expect("Parent should have a slot number"))
+ 1; + 1;
} else { } else {
@ -137,10 +139,8 @@ fn test_yaml_vectors(
// build the BeaconBlock // build the BeaconBlock
let beacon_block = BeaconBlock { let beacon_block = BeaconBlock {
slot, slot,
parent_root, previous_block_root,
state_root: state_root.clone(), state_root: state_root.clone(),
randao_reveal: randao_reveal.clone(),
eth1_data: eth1_data.clone(),
signature: signature.clone(), signature: signature.clone(),
body: body.clone(), body: body.clone(),
}; };