Add functionality to retrieve all pending items from pools #7530
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
0xKiwi
changed the title
0xKiwi
added
Ready For Review
rauljordan
reviewed
Oct 14, 2020
| func (p *Pool) PendingAttesterSlashings(ctx context.Context, state *beaconstate.BeaconState) []*ethpb.AttesterSlashing { | ||
| // This method will return all pending attester slashings unless the `block` parameter is set to true | ||
| // to indicate the request is for a block. | ||
| func (p *Pool) PendingAttesterSlashings(ctx context.Context, state *beaconstate.BeaconState, block bool) []*ethpb.AttesterSlashing { |
There was a problem hiding this comment.
block bool is ambiguous, it sounds like you want the function to block. Perhaps we can call for forProposal? or forBlockProposal?
There was a problem hiding this comment.
Maybe we can call it noLimit ?
| @@ -407,7 +416,7 @@ func TestPool_PendingProposerSlashings_Slashed(t *testing.T) { | |||
| p := &Pool{ | |||
| pendingProposerSlashing: tt.fields.pending, | |||
| } | |||
| assert.DeepEqual(t, tt.want, p.PendingProposerSlashings(context.Background(), beaconState)) | |||
| assert.DeepEqual(t, tt.want, p.PendingProposerSlashings(context.Background(), beaconState, false /*block*/)) | |||
There was a problem hiding this comment.
Change comment here if we change the input arg name to something else
| if !block { | ||
| maxSlashings = uint64(len(p.pendingAttesterSlashing)) | ||
| } | ||
| pending := make([]*ethpb.AttesterSlashing, 0, maxSlashings) | ||
| for i := 0; i < len(p.pendingAttesterSlashing); i++ { | ||
| slashing := p.pendingAttesterSlashing[i] |
There was a problem hiding this comment.
Can you move slashing := ... after the break check?
| if !block { | ||
| maxSlashings = uint64(len(p.pendingProposerSlashing)) | ||
| } | ||
| pending := make([]*ethpb.ProposerSlashing, 0, maxSlashings) | ||
| for i := 0; i < len(p.pendingProposerSlashing); i++ { | ||
| slashing := p.pendingProposerSlashing[i] |
There was a problem hiding this comment.
Can you move slashing := ... after the break check?
0xKiwi
commented
Oct 14, 2020
| @@ -26,25 +25,30 @@ func NewPool() *Pool { | |||
| } | |||
|
|
|||
| // PendingAttesterSlashings returns attester slashings that are able to be included into a block. | |||
| // This method will not return more than the block enforced MaxAttesterSlashings. | |||
| func (p *Pool) PendingAttesterSlashings(ctx context.Context, state *beaconstate.BeaconState) []*ethpb.AttesterSlashing { | |||
| p.lock.RLock() | |||
There was a problem hiding this comment.
Not sure why this was a RLock when this functin mutates.
rauljordan
approved these changes
Oct 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
This PR adds functionality to the slashings and exits pools to allow retrieving all pending items, as their only available action prior was to return only the max allowed per block.
This PR is needed for #7525