test(zoe): switch to E(zoe).installBundleID() #4684
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
warner
force-pushed
the
4565-update-zoe-tests
branch
5 times, most recently
from
7ccf2a6 to
4b5242f
Compare
erights
approved these changes
Mar 4, 2022
Comment on lines
+92
to
+101
| const installations = {}; | ||
| const installedPs = vatParameters.contractNames.map(name => | ||
| E(vatAdminSvc) | ||
| .getNamedBundleCap(name) | ||
| .then(bcap => E(zoe).installBundleID(D(bcap).getBundleID())) | ||
| .then(installation => { | ||
| installations[name] = installation; | ||
| }), | ||
| ); | ||
| await Promise.all(installedPs); |
There was a problem hiding this comment.
OMG was the old code doing a ton of unnecessary awaits. Good to see these reduced to one? Just curious: did you notice a speedup?
There was a problem hiding this comment.
Huh I didn't look. But also a handful of intra-kernel roundtrips would be completely swamped by the overhead of creating all the contract bundles, which takes on the order of 50 seconds, so I think I'd have to build a special test to be able to measure a difference.
warner
force-pushed
the
4565-update-zoe-tests
branch
from
4b5242f to
f97220b
Compare
The new preferred way to install a contract is by its bundleID, using `E(zoe).installBundleID(id)` instead of `E(zoe).install(bundle)`. The bundle itself must first be installed/registered with the VatAdmin service. In a real swingset, this happens out-of-band, via `controller.validateAndInstallBundle`. In a non-swingset unit test, the `fakeVatAdmin` has a new `vatAdminState.installBundle(id, bundle)`. This changes most Zoe unit tests to perform `vatAdminState.installBundle` and then use Zoe's `installBundleID` method. This requires some mechanical changes to the way many tests get access to their fakeVatAdmin. I took the opportunity to switch all tests to importing `makeFakeVatAdmin` and building their own local copy, rather than relying upon the shared singleton created and exported by `fakeVatAdmin.js` itself. This leaves one test in `unitTests/` using the old `E(zoe).install(bundle)`, to ensure it still works until we decide to remove it entirely. All tests in `swingsetTests/` still use `install(bundle)`, those will be changed later. refs #4565
This updates all swingset-based zoe tests to install contracts by BundleID instead of a full bundle. In all cases, we add the bundles by name to `config.bundles`, from which you can obtain the BundleID with: ```js const bcap = await E(vatAdminService).getNamedBundleCap(name); const id = D(bcap).getBundleID(); ``` In a real chain, the bundles would be installed into the kernel at runtime, and zoe would be given a BundleID by the (off-chain) user doing the install (or their deploy script). refs #4565
turadg
force-pushed
the
4565-update-zoe-tests
branch
from
f97220b to
96e5512
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.
The new preferred way to install a contract is by its bundleID, using
E(zoe).installBundleID(id)instead ofE(zoe).install(bundle). The bundleitself must first be installed/registered with the VatAdmin service. In a
real swingset, this happens out-of-band, via
controller.validateAndInstallBundle. In a non-swingset unit test, thefakeVatAdminhas a newvatAdminState.installBundle(id, bundle).This changes most Zoe unit tests to perform
vatAdminState.installBundleandthen use Zoe's
installBundleIDmethod. This requires some mechanicalchanges to the way many tests get access to their fakeVatAdmin. I took the
opportunity to switch all tests to importing
makeFakeVatAdminand buildingtheir own local copy, rather than relying upon the shared singleton created
and exported by
fakeVatAdmin.jsitself.This leaves one test in
unitTests/using the oldE(zoe).install(bundle),to ensure it still works until we decide to remove it entirely. All tests in
swingsetTests/still useinstall(bundle), those will be changed later.It also updates all swingset-based zoe tests to install contracts by BundleID
instead of a full bundle. In all cases, we add the bundles by name to
config.bundles, from which you can obtain the BundleID with:In a real chain, the bundles would be installed into the kernel at runtime,
and zoe would be given a BundleID by the (off-chain) user doing the
install (or their deploy script).
refs #4565