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

Revert "fix compilation errors (#25)"

Browse Source 
This reverts commit ae054d2663.
This commit is contained in:
realbigsean 2022-12-07 12:25:11 -05:00
parent ae054d2663
commit 33721d17b2
No known key found for this signature in database
GPG Key ID: B372B64D866BF8CC
1 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
beacon_node/http_api/tests/tests.rs
View File

@ -2122,7 +2122,7 @@ impl ApiTester {
self self
} }
pub async fn test_blinded_block_production<Payload: AbstractExecPayload<E>>(&self) { pub async fn test_blinded_block_production<Payload: ExecPayload<E>>(&self) {
let fork = self.chain.canonical_head.cached_head().head_fork(); let fork = self.chain.canonical_head.cached_head().head_fork();
let genesis_validators_root = self.chain.genesis_validators_root; let genesis_validators_root = self.chain.genesis_validators_root;
@ -2182,7 +2182,7 @@ impl ApiTester {
} }
} }
pub async fn test_blinded_block_production_no_verify_randao<Payload: AbstractExecPayload<E>>( pub async fn test_blinded_block_production_no_verify_randao<Payload: ExecPayload<E>>(
self, self,
) -> Self { ) -> Self {
for _ in 0..E::slots_per_epoch() { for _ in 0..E::slots_per_epoch() {
@ -2206,7 +2206,7 @@ impl ApiTester {
self self
} }
pub async fn test_blinded_block_production_verify_randao_invalid<Payload: AbstractExecPayload<E>>( pub async fn test_blinded_block_production_verify_randao_invalid<Payload: ExecPayload<E>>(
self, self,
) -> Self { ) -> Self {
let fork = self.chain.canonical_head.cached_head().head_fork(); let fork = self.chain.canonical_head.cached_head().head_fork();
@ -2664,13 +2664,11 @@ impl ApiTester {
let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await; let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2679,10 +2677,10 @@ impl ApiTester {
let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64); let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64);
assert_eq!( assert_eq!(
payload.to_execution_payload_header().fee_recipient(), payload.execution_payload_header.fee_recipient,
expected_fee_recipient expected_fee_recipient
); );
assert_eq!(payload.to_execution_payload_header().gas_limit(), 11_111_111); assert_eq!(payload.execution_payload_header.gas_limit, 11_111_111);
// If this cache is empty, it indicates fallback was not used, so the payload came from the // If this cache is empty, it indicates fallback was not used, so the payload came from the
// mock builder. // mock builder.
@ -2709,13 +2707,11 @@ impl ApiTester {
let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await; let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2724,10 +2720,10 @@ impl ApiTester {
let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64); let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64);
assert_eq!( assert_eq!(
payload.to_execution_payload_header().fee_recipient(), payload.execution_payload_header.fee_recipient,
expected_fee_recipient expected_fee_recipient
); );
assert_eq!(payload.to_execution_payload_header().gas_limit(), 30_000_000); assert_eq!(payload.execution_payload_header.gas_limit, 30_000_000);
// This cache should not be populated because fallback should not have been used. // This cache should not be populated because fallback should not have been used.
assert!(self assert!(self
@ -2757,13 +2753,11 @@ impl ApiTester {
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2771,7 +2765,7 @@ impl ApiTester {
.clone(); .clone();
assert_eq!( assert_eq!(
payload.to_execution_payload_header().fee_recipient(), payload.execution_payload_header.fee_recipient,
test_fee_recipient test_fee_recipient
); );
@ -2807,17 +2801,15 @@ impl ApiTester {
.beacon_state .beacon_state
.latest_execution_payload_header() .latest_execution_payload_header()
.unwrap() .unwrap()
.block_hash(); .block_hash;
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2825,7 +2817,7 @@ impl ApiTester {
.clone(); .clone();
assert_eq!( assert_eq!(
payload.to_execution_payload_header().parent_hash(), payload.execution_payload_header.parent_hash,
expected_parent_hash expected_parent_hash
); );
@ -2864,13 +2856,11 @@ impl ApiTester {
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2878,7 +2868,7 @@ impl ApiTester {
.clone(); .clone();
assert_eq!( assert_eq!(
payload.to_execution_payload_header().prev_randao(), payload.execution_payload_header.prev_randao,
expected_prev_randao expected_prev_randao
); );
@ -2911,18 +2901,16 @@ impl ApiTester {
.beacon_state .beacon_state
.latest_execution_payload_header() .latest_execution_payload_header()
.unwrap() .unwrap()
.block_number() .block_number
+ 1; + 1;
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -2930,7 +2918,7 @@ impl ApiTester {
.clone(); .clone();
assert_eq!( assert_eq!(
payload.to_execution_payload_header().block_number(), payload.execution_payload_header.block_number,
expected_block_number expected_block_number
); );
@ -2963,24 +2951,22 @@ impl ApiTester {
.beacon_state .beacon_state
.latest_execution_payload_header() .latest_execution_payload_header()
.unwrap() .unwrap()
.timestamp(); .timestamp;
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
.unwrap() .unwrap()
.clone(); .clone();
assert!(payload.to_execution_payload_header().timestamp() > min_expected_timestamp); assert!(payload.execution_payload_header.timestamp > min_expected_timestamp);
// If this cache is populated, it indicates fallback to the local EE was correctly used. // If this cache is populated, it indicates fallback to the local EE was correctly used.
assert!(self assert!(self
@ -3005,13 +2991,11 @@ impl ApiTester {
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3044,13 +3028,11 @@ impl ApiTester {
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3089,13 +3071,11 @@ impl ApiTester {
.get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch())) .get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch()))
.await; .await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3120,13 +3100,11 @@ impl ApiTester {
.get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch())) .get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch()))
.await; .await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3171,13 +3149,11 @@ impl ApiTester {
.get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch())) .get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch()))
.await; .await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3211,14 +3187,12 @@ impl ApiTester {
let (_, randao_reveal) = self let (_, randao_reveal) = self
.get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch())) .get_test_randao(next_slot, next_slot.epoch(E::slots_per_epoch()))
.await; .await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(next_slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3257,13 +3231,11 @@ impl ApiTester {
let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await; let (proposer_index, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()
@ -3272,7 +3244,7 @@ impl ApiTester {
let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64); let expected_fee_recipient = Address::from_low_u64_be(proposer_index as u64);
assert_eq!( assert_eq!(
payload.to_execution_payload_header().fee_recipient(), payload.execution_payload_header.fee_recipient,
expected_fee_recipient expected_fee_recipient
); );
@ -3303,13 +3275,11 @@ impl ApiTester {
let (_, randao_reveal) = self.get_test_randao(slot, epoch).await; let (_, randao_reveal) = self.get_test_randao(slot, epoch).await;
let beacon_block_response = self let payload = self
.client .client
.get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None) .get_validator_blinded_blocks::<E, BlindedPayload<E>>(slot, &randao_reveal, None)
.await .await
.unwrap(); .unwrap()
let payload = beacon_block_response
.data .data
.body() .body()
.execution_payload() .execution_payload()