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.

Sign up for GitHub

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

Jump to bottom

Place CrdsData::AccountsHashes in same enum ordinal position as the v1.0 version #9251

Merged
merged 1 commit into from
Apr 2, 2020
Merged

Place CrdsData::AccountsHashes in same enum ordinal position as the v1.0 version #9251

merged 1 commit into from
Apr 2, 2020

Conversation

mvines
Copy link
Member

@mvines mvines commented Apr 2, 2020

AccountsHashes immediately follows SnapshotHashes in v1.0:

solana/core/src/crds_value.rs

Lines 62 to 68 in d4bb7ce

pub enum CrdsData {
ContactInfo(ContactInfo),
Vote(VoteIndex, Vote),
EpochSlots(EpochSlotIndex, EpochSlots),
SnapshotHashes(SnapshotHash),
AccountsHashes(SnapshotHash),
}

In v1.1, the new EpochSlots item snuck in between them

@mvines mvines added the v1.1 label Apr 2, 2020
@mvines mvines requested a review from sakridge April 2, 2020 00:35
@ryoqun
Copy link
Member

ryoqun commented Apr 2, 2020

I miss #7738... Sorry for not being able to land it on time..

@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Apr 2, 2020
@solana-grimes solana-grimes merged commit 8b14eb9 into solana-labs:master Apr 2, 2020
@codecov
Copy link

codecov bot commented Apr 2, 2020

Codecov Report

Merging #9251 into master will decrease coverage by <.1%.
The diff coverage is 100%.

@@           Coverage Diff            @@
##           master   #9251     +/-   ##
========================================
- Coverage      81%     81%   -0.1%     
========================================
  Files         276     276             
  Lines       61072   61072             
========================================
- Hits        49478   49477      -1     
- Misses      11594   11595      +1

mergify bot pushed a commit that referenced this pull request Apr 2, 2020
@mvines
Place AccountsHashes in same enum ordinal position as the v1.0 version (
933e7d6 
#9251)

automerge

(cherry picked from commit 8b14eb9)
@mergify mergify bot mentioned this pull request Apr 2, 2020
Merged
mvines added a commit that referenced this pull request Apr 2, 2020
@mergify @mvines
Place AccountsHashes in same enum ordinal position as the v1.0 version (
68a4288 
#9251) (#9253)

automerge

(cherry picked from commit 8b14eb9)

Co-authored-by: Michael Vines <[email protected]>
@mvines mvines deleted the ord branch April 2, 2020 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeyakovenko aeyakovenko aeyakovenko approved these changes

@sakridge sakridge Awaiting requested review from sakridge

Assignees
No one assigned
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mvines @ryoqun @aeyakovenko @solana-grimes