Skip to content

Commit

Permalink
cargo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
realbigsean committed Oct 5, 2022
1 parent b5b4ce9 commit 44515b8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
7 changes: 3 additions & 4 deletions beacon_node/beacon_chain/src/blob_verification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ use derivative::Derivative;
use slot_clock::SlotClock;

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 std::sync::Arc;
use types::{
consts::eip4844::BLS_MODULUS, BeaconStateError, BlobsSidecar, EthSpec, Hash256,
consts::eip4844::BLS_MODULUS, BeaconStateError, Hash256,
SignedBlobsSidecar, Slot,
};

Expand Down Expand Up @@ -105,7 +104,7 @@ impl<'a, T: BeaconChainTypes> VerifiedBlobsSidecar<'a, T> {
chain: &BeaconChain<T>,
) -> Result<Self, BlobError> {
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.
let latest_permissible_slot = chain
.slot_clock
Expand Down
3 changes: 1 addition & 2 deletions beacon_node/beacon_chain/src/execution_payload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::{
BeaconChain, BeaconChainError, BeaconChainTypes, BlockError, BlockProductionError,
ExecutionPayloadError,
};
use execution_layer::json_structures::JsonBlobBundlesV1;
use execution_layer::{BuilderParams, PayloadStatus};
use fork_choice::{InvalidationOperation, PayloadVerificationStatus};
use proto_array::{Block as ProtoBlock, ExecutionStatus};
Expand All @@ -26,7 +25,7 @@ use std::sync::Arc;
use tokio::task::JoinHandle;
use tree_hash::TreeHash;
use types::{
BeaconBlockRef, BeaconState, BeaconStateError, Blob, BlobsSidecar, EthSpec, ExecPayload,
BeaconBlockRef, BeaconState, BeaconStateError, Blob, EthSpec, ExecPayload,
ExecutionBlockHash, Hash256, KzgCommitment, SignedBeaconBlock, Slot,
};

Expand Down
11 changes: 4 additions & 7 deletions beacon_node/http_api/src/publish_blobs.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
use crate::metrics;
use beacon_chain::validator_monitor::{get_block_delay_ms, get_slot_delay_ms, timestamp_now};
use beacon_chain::{BeaconChain, BeaconChainTypes, BlockError, CountUnrealized};
use beacon_chain::validator_monitor::{get_slot_delay_ms, timestamp_now};
use beacon_chain::{BeaconChain, BeaconChainTypes};
use lighthouse_network::PubsubMessage;
use network::NetworkMessage;
use slog::{crit, error, info, warn, Logger};
use slot_clock::SlotClock;
use slog::{Logger};
use std::sync::Arc;
use tokio::sync::mpsc::UnboundedSender;
use tree_hash::TreeHash;
use types::{
BlindedPayload, ExecPayload, ExecutionBlockHash, ExecutionPayload, FullPayload, Hash256,
SignedBeaconBlock, SignedBlobsSidecar,
SignedBlobsSidecar,
};
use warp::Rejection;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2245,10 +2245,10 @@ impl<T: BeaconChainTypes> Worker<T> {
BlobError::PastSlot { .. } => {
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);
}
BlobError::BlobOutOfRange { blob_index } => {
BlobError::BlobOutOfRange { blob_index: _ } => {
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
}
BlobError::InvalidKZGCommitment => {
Expand All @@ -2257,7 +2257,7 @@ impl<T: BeaconChainTypes> Worker<T> {
BlobError::ProposalSignatureInvalid => {
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);
}
BlobError::UnknownHeadBlock { beacon_block_root } => {
Expand Down
2 changes: 1 addition & 1 deletion consensus/types/src/blobs_sidecar.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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 ssz::Encode;
use ssz_derive::{Decode, Encode};
Expand Down

0 comments on commit 44515b8

Please sign in to comment.