fmt
This commit is contained in:
parent
6bf439befd
commit
aeb243fe61
@ -77,7 +77,7 @@ impl<E: EthSpec> EarlyAttesterCache<E> {
|
|||||||
source,
|
source,
|
||||||
target,
|
target,
|
||||||
block,
|
block,
|
||||||
blobs: blobs.map_err(|_|Error::MissingBlobs)?,
|
blobs: blobs.map_err(|_| Error::MissingBlobs)?,
|
||||||
proto_block,
|
proto_block,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use derivative::Derivative;
|
|
||||||
use crate::test_utils::TestRandom;
|
use crate::test_utils::TestRandom;
|
||||||
use crate::{Blob, EthSpec, Hash256, SignedRoot, Slot};
|
use crate::{Blob, EthSpec, Hash256, SignedRoot, Slot};
|
||||||
|
use derivative::Derivative;
|
||||||
use kzg::KzgProof;
|
use kzg::KzgProof;
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use ssz::Encode;
|
use ssz::Encode;
|
||||||
@ -11,7 +11,7 @@ use tree_hash_derive::TreeHash;
|
|||||||
|
|
||||||
#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
|
#[cfg_attr(feature = "arbitrary-fuzz", derive(arbitrary::Arbitrary))]
|
||||||
#[derive(
|
#[derive(
|
||||||
Debug, Clone, Serialize, Deserialize, Encode, Decode, TreeHash, Default, TestRandom, Derivative
|
Debug, Clone, Serialize, Deserialize, Encode, Decode, TreeHash, Default, TestRandom, Derivative,
|
||||||
)]
|
)]
|
||||||
#[serde(bound = "T: EthSpec")]
|
#[serde(bound = "T: EthSpec")]
|
||||||
#[derivative(PartialEq, Hash(bound = "T: EthSpec"))]
|
#[derivative(PartialEq, Hash(bound = "T: EthSpec"))]
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
use crate::signed_beacon_block::BlobReconstructionError;
|
use crate::signed_beacon_block::BlobReconstructionError;
|
||||||
use crate::{BlobsSidecar, EthSpec, Hash256, SignedBeaconBlock, SignedBeaconBlockEip4844, Slot};
|
use crate::{BlobsSidecar, EthSpec, Hash256, SignedBeaconBlock, SignedBeaconBlockEip4844, Slot};
|
||||||
|
use derivative::Derivative;
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use ssz::{Decode, DecodeError};
|
use ssz::{Decode, DecodeError};
|
||||||
use ssz_derive::{Decode, Encode};
|
use ssz_derive::{Decode, Encode};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tree_hash_derive::TreeHash;
|
use tree_hash_derive::TreeHash;
|
||||||
use derivative::Derivative;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, TreeHash, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, TreeHash, PartialEq)]
|
||||||
#[serde(bound = "T: EthSpec")]
|
#[serde(bound = "T: EthSpec")]
|
||||||
@ -93,14 +93,20 @@ impl<T: EthSpec> BlockWrapper<T> {
|
|||||||
self.block().parent_root()
|
self.block().parent_root()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn deconstruct(self, block_root: Option<Hash256>) -> (Arc<SignedBeaconBlock<T>>, Result<Option<Arc<BlobsSidecar<T>>>, BlobReconstructionError>) {
|
pub fn deconstruct(
|
||||||
|
self,
|
||||||
|
block_root: Option<Hash256>,
|
||||||
|
) -> (
|
||||||
|
Arc<SignedBeaconBlock<T>>,
|
||||||
|
Result<Option<Arc<BlobsSidecar<T>>>, BlobReconstructionError>,
|
||||||
|
) {
|
||||||
match self {
|
match self {
|
||||||
BlockWrapper::Block(block) => {
|
BlockWrapper::Block(block) => {
|
||||||
let blobs = block
|
let blobs = block
|
||||||
.reconstruct_empty_blobs(block_root)
|
.reconstruct_empty_blobs(block_root)
|
||||||
.map(|blob_opt| blob_opt.map(Arc::new));
|
.map(|blob_opt| blob_opt.map(Arc::new));
|
||||||
(block,blobs)
|
(block, blobs)
|
||||||
} ,
|
}
|
||||||
BlockWrapper::BlockAndBlob(block_sidecar_pair) => {
|
BlockWrapper::BlockAndBlob(block_sidecar_pair) => {
|
||||||
let SignedBeaconBlockAndBlobsSidecar {
|
let SignedBeaconBlockAndBlobsSidecar {
|
||||||
beacon_block,
|
beacon_block,
|
||||||
|
Loading…
Reference in New Issue
Block a user