Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove un-used batch sync error condition #6917

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

dapplion
Copy link
Collaborator

@dapplion dapplion commented Feb 6, 2025

Issue Addressed

I forgot to remove the consumers of those errors

Proposed Changes

Remove un-used batch sync error condition, which was a nested Result<_, Result<_, E>>

@dapplion dapplion requested a review from jxs as a code owner February 6, 2025 02:27
@dapplion dapplion requested review from AgeManning and jimmygchen and removed request for jxs February 6, 2025 02:27
.get_mut(peer_id)
.map(|active_requests| active_requests.remove(&batch_id));

let received = batch.download_completed(blocks)?;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it's a regular WrongState error, we can just ?

@@ -265,40 +265,21 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
}
};

{
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this unnecessary closure

@jimmygchen jimmygchen added ready-for-review The code is ready for review syncing labels Feb 6, 2025
@realbigsean realbigsean self-requested a review February 6, 2025 18:15
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, looks a lot simpler

@realbigsean
Copy link
Member

@mergify queue

Copy link

mergify bot commented Feb 6, 2025

queue

🛑 The pull request has been removed from the queue default

The merge conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

mergify bot added a commit that referenced this pull request Feb 6, 2025
Copy link

mergify bot commented Feb 6, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@jimmygchen jimmygchen added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Feb 7, 2025
mergify bot added a commit that referenced this pull request Feb 7, 2025
mergify bot added a commit that referenced this pull request Feb 7, 2025
mergify bot added a commit that referenced this pull request Feb 7, 2025
mergify bot added a commit that referenced this pull request Feb 7, 2025
Copy link

mergify bot commented Feb 7, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

eserilev pushed a commit to eserilev/lighthouse that referenced this pull request Feb 7, 2025
- PR sigp#6497 made obsolete some consistency checks inside the batch

I forgot to remove the consumers of those errors


  Remove un-used batch sync error condition, which was a nested `Result<_, Result<_, E>>`
@michaelsproul michaelsproul added blocked and removed ready-for-merge This PR is ready to merge. labels Feb 10, 2025
@michaelsproul
Copy link
Member

michaelsproul commented Feb 10, 2025

Removing from merge queue temporarily while we merge v7 PRs

@jimmygchen jimmygchen added ready-for-merge This PR is ready to merge. and removed blocked labels Feb 10, 2025
@jimmygchen
Copy link
Member

@mergify requeue

Copy link

mergify bot commented Feb 10, 2025

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

mergify bot added a commit that referenced this pull request Feb 10, 2025
Copy link

mergify bot commented Feb 11, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@jimmygchen
Copy link
Member

@mergify requeue

Copy link

mergify bot commented Feb 11, 2025

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

mergify bot added a commit that referenced this pull request Feb 11, 2025
@mergify mergify bot merged commit 431dd7c into sigp:unstable Feb 11, 2025
31 checks passed
@dapplion dapplion deleted the drop-range-sync-unused-err branch February 11, 2025 16:47
pawanjay176 pushed a commit to pawanjay176/lighthouse that referenced this pull request Feb 21, 2025
- PR sigp#6497 made obsolete some consistency checks inside the batch

I forgot to remove the consumers of those errors


  Remove un-used batch sync error condition, which was a nested `Result<_, Result<_, E>>`
eserilev pushed a commit to eserilev/lighthouse that referenced this pull request Mar 5, 2025
- PR sigp#6497 made obsolete some consistency checks inside the batch

I forgot to remove the consumers of those errors


  Remove un-used batch sync error condition, which was a nested `Result<_, Result<_, E>>`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
ready-for-merge This PR is ready to merge. syncing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants