fix: change all packages to call createVatAdminService the new way

The swingset fix for #4521 requires all callers of `createVatAdminService()` to provide it with `devices.bundle` in addition to the existing `devices.vatAdmin`. This occurs in the `bootstrap()` function, in both the production configuration (`packages/vats/src/bootstrap.js`) and in swingset-based unit tests in all packages. This commit updates all agoric-sdk packages to do this. refs #4521
Agoric · Feb 13, 2022 · 65d6858 · 65d6858
1 parent 8de4838
commit 65d6858
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 2 deletions.
diff --git a/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js b/packages/governance/test/swingsetTests/committeeBinary/bootstrap.js
@@ -211,6 +211,7 @@ const makeBootstrap = (argv, cb, vatPowers) => async (vats, devices) => {
   const log = vatPowers.testLog;
   const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
     devices.vatAdmin,
+    devices.bundle,
   );
   /** @type { ERef<ZoeService> } */
   const zoe = E(vats.zoe).buildZoe(vatAdminSvc);

diff --git a/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js b/packages/governance/test/swingsetTests/contractGovernor/bootstrap.js
@@ -187,6 +187,7 @@ const makeBootstrap = (argv, cb, vatPowers) => async (vats, devices) => {
   const log = vatPowers.testLog;
   const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
     devices.vatAdmin,
+    devices.bundle,
   );
   /** @type { ERef<ZoeService> } */
   const zoe = E(vats.zoe).buildZoe(vatAdminSvc);

diff --git a/packages/run-protocol/test/vaultFactory/swingsetTests/governance/bootstrap.js b/packages/run-protocol/test/vaultFactory/swingsetTests/governance/bootstrap.js
@@ -80,6 +80,7 @@ const makeBootstrap = (argv, cb, vatPowers) => async (vats, devices) => {
   const log = vatPowers.testLog;
   const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
     devices.vatAdmin,
+    devices.bundle,
   );
   const { zoe, feeMintAccess } = await E(vats.zoe).buildZoe(vatAdminSvc);
 

diff --git a/packages/run-protocol/test/vaultFactory/swingsetTests/vaultFactory/bootstrap.js b/packages/run-protocol/test/vaultFactory/swingsetTests/vaultFactory/bootstrap.js
@@ -8,6 +8,7 @@ function makeBootstrap(argv, cb, vatPowers) {
   return async (vats, devices) => {
     const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
       devices.vatAdmin,
+      devices.bundle,
     );
     const { zoe, feeMintAccess } = await E(vats.zoe).buildZoe(vatAdminSvc);
 

diff --git a/packages/spawner/test/swingsetTests/contractHost/bootstrap.js b/packages/spawner/test/swingsetTests/contractHost/bootstrap.js
@@ -65,6 +65,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const spawner = await E(vats.spawner).buildSpawner(vatAdminSvc);
       const [mode, trivialBundle] = vatParameters.argv;

diff --git a/packages/swingset-runner/src/vat-launcher.js b/packages/swingset-runner/src/vat-launcher.js
@@ -26,7 +26,10 @@ export function buildRootObject(_vatPowers, vatParameters) {
 
   return Far('root', {
     async bootstrap(vats, devices) {
-      const vatMaker = E(vats.vatAdmin).createVatAdminService(devices.vatAdmin);
+      const vatMaker = E(vats.vatAdmin).createVatAdminService(
+        devices.vatAdmin,
+        devices.bundle,
+      );
       const vatRoots = {};
       for (const vatName of Object.keys(vatParameters.config.vats)) {
         const vatDesc = vatParameters.config.vats[vatName];

diff --git a/packages/vats/src/bootstrap.js b/packages/vats/src/bootstrap.js
@@ -970,6 +970,7 @@ export function buildRootObject(vatPowers, vatParameters) {
 
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
 
       console.debug(`${ROLE} bootstrap starting`);

diff --git a/packages/vats/src/core/basic-behaviors.js b/packages/vats/src/core/basic-behaviors.js
@@ -18,7 +18,10 @@ export const makeVatsFromBundles = ({
   devices,
   produce: { vatAdminSvc, loadVat },
 }) => {
-  const svc = E(vats.vatAdmin).createVatAdminService(devices.vatAdmin);
+  const svc = E(vats.vatAdmin).createVatAdminService(
+    devices.vatAdmin,
+    devices.bundle,
+  );
   vatAdminSvc.resolve(svc);
   // TODO: getVat? do we need to memoize this by name?
   // TODO: rename loadVat to createVatByName?

diff --git a/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js b/packages/zoe/test/swingsetTests/brokenContracts/bootstrap.js
@@ -44,6 +44,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {

diff --git a/packages/zoe/test/swingsetTests/makeKind/bootstrap.js b/packages/zoe/test/swingsetTests/makeKind/bootstrap.js
@@ -7,6 +7,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {

diff --git a/packages/zoe/test/swingsetTests/offerArgs/bootstrap.js b/packages/zoe/test/swingsetTests/offerArgs/bootstrap.js
@@ -7,6 +7,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {

diff --git a/packages/zoe/test/swingsetTests/privateArgs/bootstrap.js b/packages/zoe/test/swingsetTests/privateArgs/bootstrap.js
@@ -7,6 +7,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {

diff --git a/packages/zoe/test/swingsetTests/runMint/bootstrap.js b/packages/zoe/test/swingsetTests/runMint/bootstrap.js
@@ -7,6 +7,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const { zoe, feeMintAccess } = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {

diff --git a/packages/zoe/test/swingsetTests/zoe/bootstrap.js b/packages/zoe/test/swingsetTests/zoe/bootstrap.js
@@ -86,6 +86,7 @@ export function buildRootObject(vatPowers, vatParameters) {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
         devices.vatAdmin,
+        devices.bundle,
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
       const installations = {