gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-16 02:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-27 22:47:19 +02:00
parent d2ec1cda51
commit 9debb1a30b
6 changed files with 1 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2793,25 +2793,6 @@ impl ApiTester {
self
}
<<<<<<< HEAD
pub async fn test_post_beacon_pool_payload_attestations_valid(mut self) -> Self {
let slot = self.chain.slot().unwrap();
let head_root = self.chain.head_beacon_block_root();
let message = PayloadAttestationMessage {
validator_index: 0,
data: PayloadAttestationData {
beacon_block_root: head_root,
slot,
payload_present: true,
blob_data_available: true,
},
signature: Signature::empty(),
};
self.client
.post_beacon_pool_payload_attestations(&[message])
=======
fn make_valid_payload_attestation_message(
&self,
ptc_offset: usize,
@@ -2867,7 +2848,6 @@ impl ApiTester {
self.client
.post_beacon_pool_payload_attestations(&[message], fork_name)
>>>>>>> 028b5a42a9715c31f416d45db70add39d9934b12
.await
.unwrap();
@@ -2880,30 +2860,11 @@ impl ApiTester {
}
pub async fn test_post_beacon_pool_payload_attestations_valid_ssz(mut self) -> Self {
<<<<<<< HEAD
let slot = self.chain.slot().unwrap();
let head_root = self.chain.head_beacon_block_root();
let message = PayloadAttestationMessage {
validator_index: 0,
data: PayloadAttestationData {
beacon_block_root: head_root,
slot,
payload_present: true,
blob_data_available: true,
},
signature: Signature::empty(),
};
self.client
.post_beacon_pool_payload_attestations_ssz(&[message])
=======
let message = self.make_valid_payload_attestation_message(1);
let fork_name = self.chain.spec.fork_name_at_slot::<E>(message.data.slot);
self.client
.post_beacon_pool_payload_attestations_ssz(&[message], fork_name)
>>>>>>> 028b5a42a9715c31f416d45db70add39d9934b12
.await
.unwrap();