Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

v2.1: simplify forward packet batches (backport of #3642) #3649

Merged
merged 2 commits into from
Nov 15, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 14, 2024

Problem

logic in this structure can be simplified

Summary of Changes

  • Use NonZeroU64 to avoid doing checked_div every packet
  • Remove branching
  • make testing simpler

Fixes #


This is an automatic backport of pull request #3642 done by [Mergify](https://mergify.com).

simplify forward packet batches - nonzero, no branching

(cherry picked from commit 2cb11a7)

# Conflicts:
#	core/src/banking_stage/forward_packet_batches_by_accounts.rs
@mergify mergify bot requested a review from a team as a code owner November 14, 2024 23:06
@mergify mergify bot added the conflicts label Nov 14, 2024
Copy link
Author

mergify bot commented Nov 14, 2024

Cherry-pick of 2cb11a7 has failed:

On branch mergify/bp/v2.1/pr-3642
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 2cb11a7e2c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage/forward_packet_batches_by_accounts.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

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

LGTM

@apfitzge apfitzge merged commit 34e62d6 into v2.1 Nov 15, 2024
28 checks passed
@apfitzge apfitzge deleted the mergify/bp/v2.1/pr-3642 branch November 15, 2024 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants