mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-07 00:42:42 +00:00
fix merge conflict
This commit is contained in:
@@ -168,7 +168,7 @@ pub struct QueuedRpcBlock<T: EthSpec> {
|
|||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct QueuedBackfillBatch<E: EthSpec> {
|
pub struct QueuedBackfillBatch<E: EthSpec> {
|
||||||
pub process_id: ChainSegmentProcessId,
|
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> {
|
impl<T: BeaconChainTypes> TryFrom<WorkEvent<T>> for QueuedBackfillBatch<T::EthSpec> {
|
||||||
|
|||||||
Reference in New Issue
Block a user