[Merged by Bors] - Remove saturating arith from state_processing #1644
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
michaelsproul
added
ready-for-review
michaelsproul
force-pushed
the
unsaturated-arith
branch
from
2be0054 to
af00329
Compare
paulhauner
approved these changes
Sep 25, 2020
There was a problem hiding this comment.
Beautiful, couldn't fault it.
During this review, but not caused by this PR, I did notice some assumptions about the genesis slot being zero. I documented them in #1666 (issue of the beast 🤘).
I'll let your bors it :)
paulhauner
added
ready-for-merge
|
Thank you! bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Sep 25, 2020
## Issue Addressed Resolves #1100 ## Proposed Changes * Implement the `SafeArith` trait for `Slot` and `Epoch`, so that methods like `safe_add` become available. * Tweak the `SafeArith` trait to allow a different `Rhs` type (analagous to `std::ops::Add`, etc). * Add a `legacy-arith` feature to `types` and `state_processing` that conditionally enables implementations of the `std` ops with saturating semantics. * Check compilation of `types` and `state_processing` _without_ `legacy-arith` on CI, thus guaranteeing that they only use the `SafeArith` primitives :tada: ## Additional Info The `legacy-arith` feature gets turned on by all higher-level crates that depend on `state_processing` or `types`, thus allowing the beacon chain, networking, and other components to continue to rely on the availability of ops like `+`, `-`, `*`, etc. **This is a consensus-breaking change**, but brings us in line with the spec, and our incompatibilities shouldn't have been reachable with any valid configuration of Eth2 parameters.
|
Pull request successfully merged into master. Build succeeded: |
bors
bot
changed the title
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.
Issue Addressed
Resolves #1100
Proposed Changes
SafeArithtrait forSlotandEpoch, so that methods likesafe_addbecome available.SafeArithtrait to allow a differentRhstype (analagous tostd::ops::Add, etc).legacy-arithfeature totypesandstate_processingthat conditionally enables implementations ofthe
stdops with saturating semantics.typesandstate_processingwithoutlegacy-arithon CI,thus guaranteeing that they only use the
SafeArithprimitives 🎉Additional Info
The
legacy-arithfeature gets turned on by all higher-level crates that depend onstate_processingortypes, thus allowing the beacon chain, networking, and other components to continue to rely on the availability of ops like+,-,*, etc.This is a consensus-breaking change, but brings us in line with the spec, and our incompatibilities shouldn't have been reachable with any valid configuration of Eth2 parameters.