Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

shrinks size of Packet.Meta (backport #22224)#22273

Merged
mergify[bot] merged 4 commits intov1.9from
mergify/bp/v1.9/pr-22224
Jan 4, 2022
Merged

shrinks size of Packet.Meta (backport #22224)#22273
mergify[bot] merged 4 commits intov1.9from
mergify/bp/v1.9/pr-22224

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 4, 2022

This is an automatic backport of pull request #22224 done by Mergify.
Cherry-pick of 73a7741 has failed:

On branch mergify/bp/v1.9/pr-22224
Your branch is ahead of 'origin/v1.9' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 73a7741c4.
  (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)

Changes to be committed:
	modified:   core/benches/sigverify_stage.rs
	modified:   core/src/sigverify_stage.rs
	modified:   sdk/src/packet.rs

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

Cherry-pick of 01a096a has failed:

On branch mergify/bp/v1.9/pr-22224
Your branch is ahead of 'origin/v1.9' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 01a096adc.
  (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)

Changes to be committed:
	modified:   Cargo.lock
	modified:   core/benches/sigverify_stage.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/repair_response.rs
	modified:   core/src/retransmit_stage.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   core/src/sigverify_shreds.rs
	modified:   core/src/sigverify_stage.rs
	modified:   core/src/window_service.rs
	modified:   entry/src/entry.rs
	modified:   ledger/src/sigverify_shreds.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/sigverify.rs
	modified:   programs/bpf/Cargo.lock
	modified:   sdk/src/packet.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/Cargo.toml

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

507367e
updated window-service to send shreds (as opposed to packets) to
retransmit-stage and so seed and slot fields in Packet.Meta are unused:
https://github.com/solana-labs/solana/blob/d6ec103be/sdk/src/packet.rs#L27-L28

(cherry picked from commit aa9f7ed)
(cherry picked from commit 73a7741)

# Conflicts:
#	streamer/src/streamer.rs
Instead of a separate bool type for each flag, all the flags can be
encoded in a type-safe bitflags encoded in a single u8:
https://github.com/solana-labs/solana/blob/d6ec103be/sdk/src/packet.rs#L19-L31

(cherry picked from commit 01a096a)

# Conflicts:
#	sdk/Cargo.toml
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.9/pr-22224 branch from f1bc532 to 50f73d0 Compare January 4, 2022 14:03
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 4, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 4, 2022

Codecov Report

Merging #22273 (50f73d0) into v1.9 (3b59f67) will increase coverage by 0.0%.
The diff coverage is 88.6%.

@@           Coverage Diff           @@
##             v1.9   #22273   +/-   ##
=======================================
  Coverage    81.1%    81.1%           
=======================================
  Files         518      518           
  Lines      145068   145055   -13     
=======================================
+ Hits       117662   117668    +6     
+ Misses      27406    27387   -19     

@mergify mergify Bot merged commit d84b994 into v1.9 Jan 4, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22224 branch January 4, 2022 17:41
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant