Implement Expired variant, Scheduled #606
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
orkunkl
changed the title
orkunkl
force-pushed
the
add-scheduled
branch
from
4a24932 to
56ee692
Compare
ueco-jb
reviewed
Dec 27, 2021
Comment on lines
+31
to
+64
| impl Scheduled { | ||
| #[allow(dead_code)] | ||
| pub fn is_triggered(&self, block: &BlockInfo) -> bool { | ||
| match self { | ||
| Scheduled::AtHeight(height) => block.height >= *height, | ||
| Scheduled::AtTime(time) => block.time >= *time, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Add<Duration> for Scheduled { | ||
| type Output = StdResult<Scheduled>; | ||
|
|
||
| fn add(self, duration: Duration) -> StdResult<Scheduled> { | ||
| match (self, duration) { | ||
| (Scheduled::AtTime(t), Duration::Time(delta)) => { | ||
| Ok(Scheduled::AtTime(t.plus_seconds(delta))) | ||
| } | ||
| (Scheduled::AtHeight(h), Duration::Height(delta)) => Ok(Scheduled::AtHeight(h + delta)), | ||
| _ => Err(StdError::generic_err("Cannot add height and time")), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl PartialOrd for Scheduled { | ||
| fn partial_cmp(&self, other: &Scheduled) -> Option<Ordering> { | ||
| match (self, other) { | ||
| // compare if both height or both time | ||
| (Scheduled::AtHeight(h1), Scheduled::AtHeight(h2)) => Some(h1.cmp(h2)), | ||
| (Scheduled::AtTime(t1), Scheduled::AtTime(t2)) => Some(t1.cmp(t2)), | ||
| _ => None, | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
It'd be usefull to test those implementations, in case someone (even by accident) changes it...
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.
This PR implements
Scheduledtype. The reason behind this is,Expirationtype represents an expiration event although the logic is great for representing future events.Expirationand deletedScheduled::Never