Merge pull request #3825 from jimmygchen/small-fixes
Various small fixes to 4844 branch
This commit is contained in:
commit
61763790d5
@ -186,7 +186,7 @@ async fn state_advance_timer<T: BeaconChainTypes>(
|
||||
head_slot,
|
||||
}) => debug!(
|
||||
log,
|
||||
"Refused to advance head state";
|
||||
"Refused to advance head state. Chain may be syncing or lagging too far behind";
|
||||
"head_slot" => head_slot,
|
||||
"current_slot" => current_slot,
|
||||
),
|
||||
|
@ -1125,11 +1125,8 @@ pub fn serve<T: BeaconChainTypes>(
|
||||
.map(|()| warp::reply())
|
||||
},
|
||||
);
|
||||
/*
|
||||
* beacon/blocks
|
||||
*/
|
||||
|
||||
// POST beacon/blocks
|
||||
// POST beacon/blinded_blocks
|
||||
let post_beacon_blinded_blocks = eth_v1
|
||||
.and(warp::path("beacon"))
|
||||
.and(warp::path("blinded_blocks"))
|
||||
|
@ -178,7 +178,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
|
||||
ExpectedBatchTy::OnlyBlock => {
|
||||
trace!(
|
||||
self.log,
|
||||
"Sending BlocksByRange Request";
|
||||
"Sending BlocksByRange request";
|
||||
"method" => "BlocksByRange",
|
||||
"count" => request.count,
|
||||
"peer" => %peer_id,
|
||||
@ -197,7 +197,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
|
||||
ExpectedBatchTy::OnlyBlockBlobs => {
|
||||
debug!(
|
||||
self.log,
|
||||
"Sending BlockBlock by range request";
|
||||
"Sending BlocksByRange and BlobsByRange requests";
|
||||
"method" => "Mixed by range request",
|
||||
"count" => request.count,
|
||||
"peer" => %peer_id,
|
||||
@ -245,7 +245,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
|
||||
ExpectedBatchTy::OnlyBlock => {
|
||||
trace!(
|
||||
self.log,
|
||||
"Sending backfill BlocksByRange Request";
|
||||
"Sending backfill BlocksByRange request";
|
||||
"method" => "BlocksByRange",
|
||||
"count" => request.count,
|
||||
"peer" => %peer_id,
|
||||
@ -264,7 +264,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
|
||||
ExpectedBatchTy::OnlyBlockBlobs => {
|
||||
debug!(
|
||||
self.log,
|
||||
"Sending BlockBlock by range request";
|
||||
"Sending backfill BlocksByRange and BlobsByRange requests";
|
||||
"method" => "Mixed by range request",
|
||||
"count" => request.count,
|
||||
"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.
|
||||
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.
|
||||
let blobs_request = Request::BlobsByRange(BlobsByRangeRequest {
|
||||
|
Loading…
Reference in New Issue
Block a user