mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 21:27:12 +00:00
Resolve merge confklicts
This commit is contained in:
@@ -11,7 +11,8 @@ use std::sync::Arc;
|
||||
use types::data::FixedBlobSidecarList;
|
||||
use types::{
|
||||
BlobSidecar, DataColumnSidecar, DataColumnSidecarFulu, DataColumnSidecarGloas, Domain, EthSpec,
|
||||
MinimalEthSpec, PayloadAttestationData, PayloadAttestationMessage, SignedRoot, Slot,
|
||||
MinimalEthSpec, PayloadAttestationData, PayloadAttestationMessage, SignedExecutionPayloadBid,
|
||||
SignedExecutionPayloadBidGloas, SignedRoot, Slot,
|
||||
};
|
||||
|
||||
type E = MinimalEthSpec;
|
||||
@@ -84,6 +85,16 @@ async fn data_column_sidecar_event_on_process_gossip_data_column() {
|
||||
let epoch = slot.epoch(E::slots_per_epoch());
|
||||
random_sidecar.slot = slot;
|
||||
random_sidecar.index = harness.chain.sampling_columns_for_epoch(epoch)[0];
|
||||
|
||||
// For gloas, the bid must be known, e.g. in the pending payload cache
|
||||
let mut bid = SignedExecutionPayloadBidGloas::<E>::empty();
|
||||
bid.message.slot = Slot::new(10);
|
||||
let bid = SignedExecutionPayloadBid::Gloas(bid);
|
||||
harness
|
||||
.chain
|
||||
.pending_payload_cache
|
||||
.insert_bid(random_sidecar.beacon_block_root, Arc::new(bid));
|
||||
|
||||
DataColumnSidecar::Gloas(random_sidecar)
|
||||
} else {
|
||||
let mut random_sidecar = DataColumnSidecarFulu::arbitrary(&mut u).unwrap();
|
||||
|
||||
Reference in New Issue
Block a user