fix merge conflict

This commit is contained in:
Diva M
2023-04-04 12:10:51 -05:00
parent cb818152f3
commit 32f9ba04d7

View File

@@ -168,7 +168,7 @@ pub struct QueuedRpcBlock<T: EthSpec> {
#[derive(Clone)]
pub struct QueuedBackfillBatch<E: EthSpec> {
pub process_id: ChainSegmentProcessId,
pub blocks: Vec<Arc<SignedBeaconBlock<E>>>,
pub blocks: Vec<BlockWrapper<E>>,
}
impl<T: BeaconChainTypes> TryFrom<WorkEvent<T>> for QueuedBackfillBatch<T::EthSpec> {