fix(SwingSet): adapt to promise tagging support#8403
Merged
mergify[bot] merged 1 commit intomasterfrom Sep 28, 2023
Merged
Conversation
FUDCo
approved these changes
Sep 28, 2023
Collaborator
FUDCo
left a comment
There was a problem hiding this comment.
Seems fine, albeit unavoidably ugly. I've got a colliding PR in flight which moves the kmarshal.js file to a different package, so I'm sure hoping Git's merge/rebase logic does the right thing!
7d941ee to
630d203
Compare
630d203 to
2e9d97d
Compare
anilhelvaci
pushed a commit
to Jorge-Lopes/agoric-sdk
that referenced
this pull request
Feb 16, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The current agoric-sdk depends on an endo before endojs/endo#1785 ,
At #8312 , @FUDCo made use of the previous kludge for tagging passable promises. But this kludge no longer works after endojs/endo#1785.
Therefore, agoric-sdk would break if upgraded to depend on current endo. with the CI errors shown at #7937 .
This PR alters the relevant code that @FUDCo added in #8312 so that it checks which technique works, and then use only that one. The CI on this PR checks that this change works in the current agoric-sdk, which currently depends on an endo before endojs/endo#1785 . This same change is also incorporated and tested by #8340 , which is like #7937 but with some fixes needed to work with the current endo. Its CI is not yet clean, but the errors from #7937 due to endojs/endo#1785 seems to have gone away.
Reviewers, in the github diff view, try both "show whitespace" and "hide whitespace" because they adapt to the moved lines in opposite ways.