cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3825 from jimmygchen/small-fixes

Browse Source 
Various small fixes to 4844 branch
This commit is contained in:
realbigsean 2022-12-22 17:12:09 -05:00 committed by GitHub
commit 61763790d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/beacon_chain/src/state_advance_timer.rs
View File

@ -186,7 +186,7 @@ async fn state_advance_timer<T: BeaconChainTypes>(
head_slot, head_slot,
}) => debug!( }) => debug!(
log, log,
"Refused to advance head state"; "Refused to advance head state. Chain may be syncing or lagging too far behind";
"head_slot" => head_slot, "head_slot" => head_slot,
"current_slot" => current_slot, "current_slot" => current_slot,
), ),

5
beacon_node/http_api/src/lib.rs
View File

@ -1125,11 +1125,8 @@ pub fn serve<T: BeaconChainTypes>(
.map(|()| warp::reply()) .map(|()| warp::reply())
}, },
); );
/*
* beacon/blocks
*/
// POST beacon/blocks // POST beacon/blinded_blocks
let post_beacon_blinded_blocks = eth_v1 let post_beacon_blinded_blocks = eth_v1
.and(warp::path("beacon")) .and(warp::path("beacon"))
.and(warp::path("blinded_blocks")) .and(warp::path("blinded_blocks"))

10
beacon_node/network/src/sync/network_context.rs
View File

@ -178,7 +178,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
ExpectedBatchTy::OnlyBlock => { ExpectedBatchTy::OnlyBlock => {
trace!( trace!(
self.log, self.log,
"Sending BlocksByRange Request"; "Sending BlocksByRange request";
"method" => "BlocksByRange", "method" => "BlocksByRange",
"count" => request.count, "count" => request.count,
"peer" => %peer_id, "peer" => %peer_id,
@ -197,7 +197,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
ExpectedBatchTy::OnlyBlockBlobs => { ExpectedBatchTy::OnlyBlockBlobs => {
debug!( debug!(
self.log, self.log,
"Sending BlockBlock by range request"; "Sending BlocksByRange and BlobsByRange requests";
"method" => "Mixed by range request", "method" => "Mixed by range request",
"count" => request.count, "count" => request.count,
"peer" => %peer_id, "peer" => %peer_id,
@ -245,7 +245,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
ExpectedBatchTy::OnlyBlock => { ExpectedBatchTy::OnlyBlock => {
trace!( trace!(
self.log, self.log,
"Sending backfill BlocksByRange Request"; "Sending backfill BlocksByRange request";
"method" => "BlocksByRange", "method" => "BlocksByRange",
"count" => request.count, "count" => request.count,
"peer" => %peer_id, "peer" => %peer_id,
@ -264,7 +264,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
ExpectedBatchTy::OnlyBlockBlobs => { ExpectedBatchTy::OnlyBlockBlobs => {
debug!( debug!(
self.log, self.log,
"Sending BlockBlock by range request"; "Sending backfill BlocksByRange and BlobsByRange requests";
"method" => "Mixed by range request", "method" => "Mixed by range request",
"count" => request.count, "count" => request.count,
"peer" => %peer_id, "peer" => %peer_id,
@ -272,7 +272,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
// create the shared request id. This is fine since the rpc handles substream ids. // create the shared request id. This is fine since the rpc handles substream ids.
let id = self.next_id(); let id = self.next_id();
let request_id = RequestId::Sync(SyncRequestId::RangeSidecarPair { id }); let request_id = RequestId::Sync(SyncRequestId::BackFillSidecarPair { id });
// Create the blob request based on the blob request. // Create the blob request based on the blob request.
let blobs_request = Request::BlobsByRange(BlobsByRangeRequest { let blobs_request = Request::BlobsByRange(BlobsByRangeRequest {