refactor!(zoe): handle subtracting empty in a less fragile way #3345
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
katelynsills
force-pushed
the
3335-collect-fees-empty
branch
2 times, most recently
from
823347b
to
648b352
Compare
|
@michaelfig, added you as a backup reviewer in case @erights is too busy and we are having trouble getting it in by Monday. |
michaelfig
approved these changes
Jun 18, 2021
Comment on lines
58
to
59
| amountToSubtract === undefined || | ||
| (amountToSubtract !== undefined && AmountMath.isEmpty(amountToSubtract)) |
There was a problem hiding this comment.
Is this just equivalent to:
Suggested change
| amountToSubtract === undefined || | |
| (amountToSubtract !== undefined && AmountMath.isEmpty(amountToSubtract)) | |
| amountToSubtract === undefined || AmountMath.isEmpty(amountToSubtract) |
There was a problem hiding this comment.
Yes, it is. I'll simplify :)
katelynsills
force-pushed
the
3335-collect-fees-empty
branch
from
648b352
to
47fd185
Compare
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.
Closes #3335
#3184 required contracts to ensure that a keyword is specified before subtracting from the amount at that keyword. For instance:
agoric-sdk/packages/zoe/src/contracts/newSwap/collectFees.js
Lines 6 to 13 in eba3074
On second thought, this is way too fragile, and too much to require of contract developers.
This PR changes Zoe such that subtracting an empty amount, even from a keyword that does not exist, will not error. This will resolve the bug in #3335 in a way that handles the edge case for developers rather than requiring them to anticipate it.