Time changes: no more builtin ms and tweaks. #233
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
mmontin
force-pushed
the
mm/ms-to-slots
branch
from
0d3f433
to
b2418a3
Compare
mmontin
changed the title
mmontin
changed the title
mmontin
force-pushed
the
mm/ms-to-slots
branch
from
b2418a3
to
412fad6
Compare
Merged
carlhammann
approved these changes
Feb 23, 2023
Co-authored-by: Facundo Domínguez <facundominguez@gmail.com>
Comment on lines
323
to
329
| -- | Return the slot that contains the given time. It holds that | ||
| -- | ||
| -- > slotToTimeInterval (getEnclosingSlot t) == (a, b) ==> a <= t <= b | ||
| -- | ||
| -- and | ||
| -- | ||
| -- > slotToTimeInterval n == (a, b) ==> getEnclosingSlot a == n && getEnclosingSlot b == n |
There was a problem hiding this comment.
Suggested change
| -- | Return the slot that contains the given time. It holds that | |
| -- | |
| -- > slotToTimeInterval (getEnclosingSlot t) == (a, b) ==> a <= t <= b | |
| -- | |
| -- and | |
| -- | |
| -- > slotToTimeInterval n == (a, b) ==> getEnclosingSlot a == n && getEnclosingSlot b == n | |
| -- | Return the slot that contains the given time. | |
| -- | |
| -- See 'slotToTimeInterval' for its relationship to 'getEnclosingSlot'. |
Perhaps we could avoid maintaining two copies of these properties.
| Ledger.Slot nr <- getEnclosingSlot r | ||
| return (nl, nr) of | ||
| Left _err -> False | ||
| Right ((nl, nr), _) -> nl == 42 && nr == 42, |
There was a problem hiding this comment.
Why 42 instead of some arbitrary integer? (Similar to the property-based test below)
| @@ -86,7 +86,7 @@ txBid submitter offerOref bid = do | |||
| Just deadline = A.getBidDeadline datum | |||
| seller = A.getSeller datum | |||
| lotPlusPreviousBidPlusNft = outputValue output | |||
| validityInterval <- slotRangeBefore deadline | |||
| validityInterval <- slotRangeBefore (deadline - 1) | |||
There was a problem hiding this comment.
Shouldn't this remain slotRangeBefore deadline? The bid validator should accept a transaction on the deadline if the node interprets slots the same as the off-chain code.
examples/src/Auction/Offchain.hs
Outdated
| @@ -149,7 +149,7 @@ txHammer submitter offerOref = do | |||
| let datum = output ^. outputDatumL | |||
| Just deadline = A.getBidDeadline datum | |||
| seller = A.getSeller datum | |||
| validityInterval <- slotRangeAfter deadline | |||
| validityInterval <- slotRangeAfter (deadline + 1) | |||
|
The change in the meaning of |
Niols
approved these changes
Feb 27, 2023
facundominguez
approved these changes
Feb 27, 2023
0xd34df00d
approved these changes
Feb 27, 2023
facundominguez
approved these changes
Feb 28, 2023
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 is both: