cargo fix
This commit is contained in:
parent
b5b4ce9509
commit
44515b8cbe
@ -2,11 +2,10 @@ use derivative::Derivative;
|
|||||||
use slot_clock::SlotClock;
|
use slot_clock::SlotClock;
|
||||||
|
|
||||||
use crate::beacon_chain::{BeaconChain, BeaconChainTypes, MAXIMUM_GOSSIP_CLOCK_DISPARITY};
|
use crate::beacon_chain::{BeaconChain, BeaconChainTypes, MAXIMUM_GOSSIP_CLOCK_DISPARITY};
|
||||||
use crate::{block_verification::get_validator_pubkey_cache, BeaconChainError};
|
use crate::{BeaconChainError};
|
||||||
use bls::PublicKey;
|
use bls::PublicKey;
|
||||||
use std::sync::Arc;
|
|
||||||
use types::{
|
use types::{
|
||||||
consts::eip4844::BLS_MODULUS, BeaconStateError, BlobsSidecar, EthSpec, Hash256,
|
consts::eip4844::BLS_MODULUS, BeaconStateError, Hash256,
|
||||||
SignedBlobsSidecar, Slot,
|
SignedBlobsSidecar, Slot,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -105,7 +104,7 @@ impl<'a, T: BeaconChainTypes> VerifiedBlobsSidecar<'a, T> {
|
|||||||
chain: &BeaconChain<T>,
|
chain: &BeaconChain<T>,
|
||||||
) -> Result<Self, BlobError> {
|
) -> Result<Self, BlobError> {
|
||||||
let blob_slot = blob_sidecar.message.beacon_block_slot;
|
let blob_slot = blob_sidecar.message.beacon_block_slot;
|
||||||
let blob_root = blob_sidecar.message.beacon_block_root;
|
let _blob_root = blob_sidecar.message.beacon_block_root;
|
||||||
// Do not gossip or process blobs from future or past slots.
|
// Do not gossip or process blobs from future or past slots.
|
||||||
let latest_permissible_slot = chain
|
let latest_permissible_slot = chain
|
||||||
.slot_clock
|
.slot_clock
|
||||||
|
@ -12,7 +12,6 @@ use crate::{
|
|||||||
BeaconChain, BeaconChainError, BeaconChainTypes, BlockError, BlockProductionError,
|
BeaconChain, BeaconChainError, BeaconChainTypes, BlockError, BlockProductionError,
|
||||||
ExecutionPayloadError,
|
ExecutionPayloadError,
|
||||||
};
|
};
|
||||||
use execution_layer::json_structures::JsonBlobBundlesV1;
|
|
||||||
use execution_layer::{BuilderParams, PayloadStatus};
|
use execution_layer::{BuilderParams, PayloadStatus};
|
||||||
use fork_choice::{InvalidationOperation, PayloadVerificationStatus};
|
use fork_choice::{InvalidationOperation, PayloadVerificationStatus};
|
||||||
use proto_array::{Block as ProtoBlock, ExecutionStatus};
|
use proto_array::{Block as ProtoBlock, ExecutionStatus};
|
||||||
@ -26,7 +25,7 @@ use std::sync::Arc;
|
|||||||
use tokio::task::JoinHandle;
|
use tokio::task::JoinHandle;
|
||||||
use tree_hash::TreeHash;
|
use tree_hash::TreeHash;
|
||||||
use types::{
|
use types::{
|
||||||
BeaconBlockRef, BeaconState, BeaconStateError, Blob, BlobsSidecar, EthSpec, ExecPayload,
|
BeaconBlockRef, BeaconState, BeaconStateError, Blob, EthSpec, ExecPayload,
|
||||||
ExecutionBlockHash, Hash256, KzgCommitment, SignedBeaconBlock, Slot,
|
ExecutionBlockHash, Hash256, KzgCommitment, SignedBeaconBlock, Slot,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,16 +1,13 @@
|
|||||||
use crate::metrics;
|
use crate::metrics;
|
||||||
use beacon_chain::validator_monitor::{get_block_delay_ms, get_slot_delay_ms, timestamp_now};
|
use beacon_chain::validator_monitor::{get_slot_delay_ms, timestamp_now};
|
||||||
use beacon_chain::{BeaconChain, BeaconChainTypes, BlockError, CountUnrealized};
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
||||||
use lighthouse_network::PubsubMessage;
|
use lighthouse_network::PubsubMessage;
|
||||||
use network::NetworkMessage;
|
use network::NetworkMessage;
|
||||||
use slog::{crit, error, info, warn, Logger};
|
use slog::{Logger};
|
||||||
use slot_clock::SlotClock;
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tokio::sync::mpsc::UnboundedSender;
|
use tokio::sync::mpsc::UnboundedSender;
|
||||||
use tree_hash::TreeHash;
|
|
||||||
use types::{
|
use types::{
|
||||||
BlindedPayload, ExecPayload, ExecutionBlockHash, ExecutionPayload, FullPayload, Hash256,
|
SignedBlobsSidecar,
|
||||||
SignedBeaconBlock, SignedBlobsSidecar,
|
|
||||||
};
|
};
|
||||||
use warp::Rejection;
|
use warp::Rejection;
|
||||||
|
|
||||||
|
@ -2245,10 +2245,10 @@ impl<T: BeaconChainTypes> Worker<T> {
|
|||||||
BlobError::PastSlot { .. } => {
|
BlobError::PastSlot { .. } => {
|
||||||
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
||||||
}
|
}
|
||||||
BlobError::BeaconChainError(e) => {
|
BlobError::BeaconChainError(_e) => {
|
||||||
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
||||||
}
|
}
|
||||||
BlobError::BlobOutOfRange { blob_index } => {
|
BlobError::BlobOutOfRange { blob_index: _ } => {
|
||||||
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
|
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
|
||||||
}
|
}
|
||||||
BlobError::InvalidKZGCommitment => {
|
BlobError::InvalidKZGCommitment => {
|
||||||
@ -2257,7 +2257,7 @@ impl<T: BeaconChainTypes> Worker<T> {
|
|||||||
BlobError::ProposalSignatureInvalid => {
|
BlobError::ProposalSignatureInvalid => {
|
||||||
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
|
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
|
||||||
}
|
}
|
||||||
BlobError::RepeatSidecar { proposer, slot } => {
|
BlobError::RepeatSidecar { proposer: _, slot: _ } => {
|
||||||
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
|
||||||
}
|
}
|
||||||
BlobError::UnknownHeadBlock { beacon_block_root } => {
|
BlobError::UnknownHeadBlock { beacon_block_root } => {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::kzg_proof::KzgProof;
|
use crate::kzg_proof::KzgProof;
|
||||||
use crate::{BeaconBlock, Blob, EthSpec, Hash256, SignedRoot, Slot};
|
use crate::{Blob, EthSpec, Hash256, SignedRoot, Slot};
|
||||||
use serde_derive::{Deserialize, Serialize};
|
use serde_derive::{Deserialize, Serialize};
|
||||||
use ssz::Encode;
|
use ssz::Encode;
|
||||||
use ssz_derive::{Decode, Encode};
|
use ssz_derive::{Decode, Encode};
|
||||||
|
Loading…
Reference in New Issue
Block a user