chore: complete #1194 Problem 2c

Agoric · Aug 16, 2020 · 01df7cf · 01df7cf
1 parent 9fc1fc7
commit 01df7cf
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/packages/swingset-runner/demo/zoeTests/bootstrap.js b/packages/swingset-runner/demo/zoeTests/bootstrap.js
@@ -2,6 +2,8 @@ import { E } from '@agoric/eventual-send';
 import { makeIssuerKit } from '@agoric/ertp';
 import buildManualTimer from './manualTimer';
 
+import { makePrintLog } from './printLog';
+
 /* eslint-disable import/no-unresolved, import/extensions */
 import automaticRefundBundle from './bundle-automaticRefund';
 import coveredCallBundle from './bundle-coveredCall';
@@ -86,7 +88,7 @@ const makeVats = (log, vats, zoe, installations, startingValues) => {
   return harden(result);
 };
 
-export function buildRootObject(vatPowers, vatParameters) {
+export function buildRootObject(_vatPowers, vatParameters) {
   const obj0 = {
     async bootstrap(vats, devices) {
       const vatAdminSvc = await E(vats.vatAdmin).createVatAdminService(
@@ -118,12 +120,12 @@ export function buildRootObject(vatPowers, vatParameters) {
         throw Error(
           `Cannot find startingValues for ${testName} in ${JSON.stringify(
             vatParameters,
-          )} or ${JSON.stringify(vatPowers)}`,
+          )} or ${JSON.stringify(_vatPowers)}`,
         );
       }
 
       const { aliceP, bobP, carolP, daveP } = makeVats(
-        vatPowers.testLog,
+        makePrintLog(),
         vats,
         zoe,
         installations,

diff --git a/packages/swingset-runner/demo/zoeTests/vat-alice.js b/packages/swingset-runner/demo/zoeTests/vat-alice.js
@@ -2,6 +2,8 @@ import { E } from '@agoric/eventual-send';
 import { makeLocalAmountMath } from '@agoric/ertp';
 import { showPurseBalance, setupIssuers } from './helpers';
 
+import { makePrintLog } from './printLog';
+
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const { moola, simoleans, purses } = await setupIssuers(zoe, issuers);
   const [moolaPurseP, simoleanPurseP] = purses;
@@ -444,8 +446,8 @@ const build = async (log, zoe, issuers, payments, installations, timer) => {
   });
 };
 
-export function buildRootObject(vatPowers) {
+export function buildRootObject(_vatPowers) {
   return harden({
-    build: (...args) => build(vatPowers.testLog, ...args),
+    build: (...args) => build(makePrintLog(), ...args),
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/vat-bob.js b/packages/swingset-runner/demo/zoeTests/vat-bob.js
@@ -4,6 +4,8 @@ import { sameStructure } from '@agoric/same-structure';
 import { makeLocalAmountMath } from '@agoric/ertp';
 import { showPurseBalance, setupIssuers } from './helpers';
 
+import { makePrintLog } from './printLog';
+
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const {
     moola,
@@ -532,8 +534,8 @@ const build = async (log, zoe, issuers, payments, installations, timer) => {
   });
 };
 
-export function buildRootObject(vatPowers) {
+export function buildRootObject(_vatPowers) {
   return harden({
-    build: (...args) => build(vatPowers.testLog, ...args),
+    build: (...args) => build(makePrintLog(), ...args),
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/vat-carol.js b/packages/swingset-runner/demo/zoeTests/vat-carol.js
@@ -3,6 +3,8 @@ import { assert, details } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';
 import { showPurseBalance, setupIssuers } from './helpers';
 
+import { makePrintLog } from './printLog';
+
 const build = async (log, zoe, issuers, payments, installations) => {
   const { moola, simoleans, purses } = await setupIssuers(zoe, issuers);
   const [moolaPurseP, simoleanPurseP] = purses;
@@ -63,8 +65,8 @@ const build = async (log, zoe, issuers, payments, installations) => {
   });
 };
 
-export function buildRootObject(vatPowers) {
+export function buildRootObject(_vatPowers) {
   return harden({
-    build: (...args) => build(vatPowers.testLog, ...args),
+    build: (...args) => build(makePrintLog(), ...args),
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/vat-dave.js b/packages/swingset-runner/demo/zoeTests/vat-dave.js
@@ -3,6 +3,8 @@ import { assert, details } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';
 import { showPurseBalance, setupIssuers } from './helpers';
 
+import { makePrintLog } from './printLog';
+
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const {
     moola,
@@ -180,8 +182,8 @@ const build = async (log, zoe, issuers, payments, installations, timer) => {
   });
 };
 
-export function buildRootObject(vatPowers) {
+export function buildRootObject(_vatPowers) {
   return harden({
-    build: (...args) => build(vatPowers.testLog, ...args),
+    build: (...args) => build(makePrintLog(), ...args),
   });
 }
diff --git a/packages/swingset-runner/demo/zoeTests/vat-zoe.js b/packages/swingset-runner/demo/zoeTests/vat-zoe.js
@@ -1,7 +1,7 @@
 // noinspection ES6PreferShortImport
 import { makeZoe } from '@agoric/zoe';
 
-export function buildRootObject(_vatPowers) {
+export function buildRootObject(__vatPowers) {
   return harden({
     buildZoe: vatAdminSvc => makeZoe(vatAdminSvc),
   });