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

Add timeouts to canonical head rwlock (#759)

Browse Source 
* Add TimeoutRwLock to BeaconChain

* Update network crate

* Update rest api

* Fix beacon chain tests

* Fix rest api tests

* Set test back to !debug_assertions
This commit is contained in:
Paul Hauner
2020-01-06 17:30:37 +11:00
committed by GitHub
parent b0c8b2b700
commit f04c55075e
21 changed files with 391 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
beacon_node/rest_api/tests/test.rs
View File

@@ -43,7 +43,12 @@ fn get_randao_reveal<T: BeaconChainTypes>(
slot: Slot,
spec: &ChainSpec,
) -> Signature {
let fork = beacon_chain.head().beacon_state.fork.clone();
let fork = beacon_chain
.head()
.expect("should get head")
.beacon_state
.fork
.clone();
let proposer_index = beacon_chain
.block_proposer(slot)
.expect("should get proposer index");
@@ -60,7 +65,12 @@ fn sign_block<T: BeaconChainTypes>(
block: &mut BeaconBlock<T::EthSpec>,
spec: &ChainSpec,
) {
let fork = beacon_chain.head().beacon_state.fork.clone();
let fork = beacon_chain
.head()
.expect("should get head")
.beacon_state
.fork
.clone();
let proposer_index = beacon_chain
.block_proposer(block.slot)
.expect("should get proposer index");
@@ -81,7 +91,11 @@ fn validator_produce_attestation() {
.client
.beacon_chain()
.expect("client should have beacon chain");
let state = beacon_chain.head().beacon_state.clone();
let state = beacon_chain
.head()
.expect("should get head")
.beacon_state
.clone();
let validator_index = 0;
let duties = state
@@ -182,6 +196,7 @@ fn validator_duties() {
let validators = beacon_chain
.head()
.expect("should get head")
.beacon_state
.validators
.iter()
@@ -534,6 +549,7 @@ fn genesis_time() {
.beacon_chain()
.expect("should have beacon chain")
.head()
.expect("should get head")
.beacon_state
.genesis_time,
genesis_time,
@@ -558,6 +574,7 @@ fn fork() {
.beacon_chain()
.expect("should have beacon chain")
.head()
.expect("should get head")
.beacon_state
.fork,
fork,
@@ -623,6 +640,7 @@ fn get_genesis_state_root() {
.beacon_chain()
.expect("should have beacon chain")
.rev_iter_state_roots()
.expect("should get iter")
.find(|(_cur_root, cur_slot)| slot == *cur_slot)
.map(|(cur_root, _)| cur_root)
.expect("chain should have state root at slot");
@@ -649,6 +667,7 @@ fn get_genesis_block_root() {
.beacon_chain()
.expect("should have beacon chain")
.rev_iter_block_roots()
.expect("should get iter")
.find(|(_cur_root, cur_slot)| slot == *cur_slot)
.map(|(cur_root, _)| cur_root)
.expect("chain should have state root at slot");
@@ -666,7 +685,7 @@ fn get_validators() {
.client
.beacon_chain()
.expect("node should have beacon chain");
let state = &chain.head().beacon_state;
let state = &chain.head().expect("should get head").beacon_state;
let validators = state.validators.iter().take(2).collect::<Vec<_>>();
let pubkeys = validators
@@ -695,7 +714,7 @@ fn get_all_validators() {
.client
.beacon_chain()
.expect("node should have beacon chain");
let state = &chain.head().beacon_state;
let state = &chain.head().expect("should get head").beacon_state;
let result = env
.runtime()
@@ -718,7 +737,7 @@ fn get_active_validators() {
.client
.beacon_chain()
.expect("node should have beacon chain");
let state = &chain.head().beacon_state;
let state = &chain.head().expect("should get head").beacon_state;
let result = env
.runtime()
@@ -764,6 +783,7 @@ fn get_committees() {
let expected = chain
.head()
.expect("should get head")
.beacon_state
.get_beacon_committees_at_epoch(RelativeEpoch::Current)
.expect("should get committees")