-
Notifications
You must be signed in to change notification settings - Fork 995
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
Fix Weird Pre-Genesis Timestamp #6031
Merged
Merged
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
rauljordan
added
Enhancement
New feature or request
Ready For Review
A pull request ready for code review
labels
May 29, 2020
0xKiwi
reviewed
May 29, 2020
0xKiwi
reviewed
May 29, 2020
0xKiwi
reviewed
May 29, 2020
beacon-chain/rpc/node/server.go
Outdated
Comment on lines
56
to
63
if err != nil { | ||
return nil, status.Errorf(codes.Internal, "Could not convert genesis time to proto: %v", err) | ||
} | ||
} else { | ||
gt, err = ptypes.TimestampProto(genesisTime) | ||
if err != nil { | ||
return nil, status.Errorf(codes.Internal, "Could not convert genesis time to proto: %v", err) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
if err != nil { | |
return nil, status.Errorf(codes.Internal, "Could not convert genesis time to proto: %v", err) | |
} | |
} else { | |
gt, err = ptypes.TimestampProto(genesisTime) | |
if err != nil { | |
return nil, status.Errorf(codes.Internal, "Could not convert genesis time to proto: %v", err) | |
} | |
} else { | |
gt, err = ptypes.TimestampProto(genesisTime) | |
} | |
if err != nil { | |
return nil, status.Errorf(codes.Internal, "Could not convert genesis time to proto: %v", err) | |
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Messed up the suggestion lol, but can you move the error check outside of the if statements? To not duplicate it.
0xKiwi
approved these changes
May 29, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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?
What does this PR do? Why is it needed?
If the beacon node is pre-genesis (as in, a genesis time has yet to be determined), the result of
will be 0001-01-01T00:00:00Z, which is not a realistic value and returns -672637623 when attempting to convert into a unix timestamp. Instead, we should do a sensible default of unix timestamp 0.
Confirmed the result works:
Which issues(s) does this PR fix?
Fixes #5548