Merge pull request #7417 from Agoric/clean-up-swingset-runner-bitrot

chore: clean up bitrot in swingset-runner
Agoric · Apr 14, 2023 · 5d158b2 · 5d158b2
2 parents 357bae8 + 07dd902
commit 5d158b2
Show file tree

Hide file tree

Showing 13 changed files with 215 additions and 139 deletions.
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
@@ -27,11 +27,14 @@ export function buildRootObject(_vatPowers, vatParameters) {
       );
       const zoe = await E(vats.zoe).buildZoe(vatAdminSvc);
 
-      const exchange = await E(zoe).install(exchangeBundle.bundle);
+      const exchange = await E(zoe).install(
+        exchangeBundle.bundle,
+        'exchangeTestContract',
+      );
 
       const grubStake = [
-        [3, 0], // Alice: 3 moola, no simoleans
-        [0, 3], // Bob:   no moola, 3 simoleans
+        [3n, 0n], // Alice: 3 moola, no simoleans
+        [0n, 3n], // Bob:   no moola, 3 simoleans
       ];
 
       const all = [makeIssuerKit('moola'), makeIssuerKit('simoleans')];
@@ -55,6 +58,9 @@ export function buildRootObject(_vatPowers, vatParameters) {
       const { publicFacet } = await E(zoe).startInstance(
         exchange,
         issuerKeywordRecord,
+        undefined,
+        undefined,
+        'contractInstance',
       );
 
       alice = E(vats.alice).build(zoe, issuers, alicePayments, publicFacet);

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js b/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
@@ -55,12 +55,12 @@ async function build(name, zoe, issuers, payments, publicFacet) {
     const buyOrderInvitation = await E(publicFacet).makeInvitation();
 
     const mySellOrderProposal = harden({
-      give: { Asset: moola(1) },
-      want: { Price: simoleans(1) },
+      give: { Asset: moola(1n) },
+      want: { Price: simoleans(1n) },
       exit: { onDemand: null },
     });
     const paymentKeywordRecord = {
-      Asset: await E(moolaPurseP).withdraw(moola(1)),
+      Asset: await E(moolaPurseP).withdraw(moola(1n)),
     };
     const seat = await E(zoe).offer(
       buyOrderInvitation,
@@ -86,12 +86,12 @@ async function build(name, zoe, issuers, payments, publicFacet) {
     );
 
     const myBuyOrderProposal = harden({
-      want: { Asset: moola(1) },
-      give: { Price: simoleans(1) },
+      want: { Asset: moola(1n) },
+      give: { Price: simoleans(1n) },
       exit: { onDemand: null },
     });
     const paymentKeywordRecord = {
-      Price: await E(simoleanPurseP).withdraw(simoleans(1)),
+      Price: await E(simoleanPurseP).withdraw(simoleans(1n)),
     };
 
     const seatP = await E(zoe).offer(
@@ -105,7 +105,7 @@ async function build(name, zoe, issuers, payments, publicFacet) {
     await postReport(quiet);
   }
 
-  return harden({
+  return Far('exchanger', {
     initiateTrade,
     respondToTrade,
   });

diff --git a/packages/swingset-runner/demo/swapBenchmark/bootstrap.js b/packages/swingset-runner/demo/swapBenchmark/bootstrap.js
@@ -74,8 +74,8 @@ export function buildRootObject(_vatPowers, vatParameters) {
       };
 
       const startingValues = [
-        [3, 0], // Alice: 3 moola, no simoleans
-        [0, 3], // Bob:   no moola, 3 simoleans
+        [3n, 0n], // Alice: 3 moola, no simoleans
+        [0n, 3n], // Bob:   no moola, 3 simoleans
       ];
 
       ({ alice, bob } = makeVats(vats, zoe, installations, startingValues));

diff --git a/packages/swingset-runner/demo/swapBenchmark/exchanger.js b/packages/swingset-runner/demo/swapBenchmark/exchanger.js
@@ -61,12 +61,12 @@ async function build(name, zoe, issuers, payments, installations) {
     );
 
     const sellProposal = harden({
-      give: { Asset: moola(1) },
-      want: { Price: simoleans(1) },
+      give: { Asset: moola(1n) },
+      want: { Price: simoleans(1n) },
       exit: { onDemand: null },
     });
     const paymentKeywordRecord = {
-      Asset: await E(moolaPurseP).withdraw(moola(1)),
+      Asset: await E(moolaPurseP).withdraw(moola(1n)),
     };
 
     const seatP = E(zoe).offer(invitation, sellProposal, paymentKeywordRecord);
@@ -86,12 +86,12 @@ async function build(name, zoe, issuers, payments, installations) {
     );
 
     const buyProposal = harden({
-      want: { Asset: moola(1) },
-      give: { Price: simoleans(1) },
+      want: { Asset: moola(1n) },
+      give: { Price: simoleans(1n) },
       exit: { onDemand: null },
     });
     const paymentKeywordRecord = {
-      Price: await E(simoleanPurseP).withdraw(simoleans(1)),
+      Price: await E(simoleanPurseP).withdraw(simoleans(1n)),
     };
 
     const seatP = await E(zoe).offer(

diff --git a/packages/swingset-runner/demo/zoeTests/bootstrap.js b/packages/swingset-runner/demo/zoeTests/bootstrap.js
@@ -39,7 +39,7 @@ const makeVats = (log, vats, zoe, installations, startingValues) => {
   const { mints, issuers, brands } = setupBasicMints();
   const makePayments = values =>
     mints.map((mint, i) =>
-      mint.mintPayment(AmountMath.make(brands[i], values[i])),
+      mint.mintPayment(AmountMath.make(brands[i], BigInt(values[i]))),
     );
   const [aliceValues, bobValues, carolValues, daveValues] = startingValues;
 

diff --git a/packages/swingset-runner/demo/zoeTests/prepareContracts.js b/packages/swingset-runner/demo/zoeTests/prepareContracts.js
@@ -10,7 +10,7 @@ const CONTRACT_FILES = [
   'autoswap',
   'coveredCall',
   {
-    contractPath: 'auction/secondPriceAuction',
+    contractPath: 'auction/index',
     bundleName: 'secondPriceAuction',
   },
   'atomicSwap',
@@ -31,7 +31,7 @@ const generateBundlesP = Promise.all(
       ({ bundleName, contractPath } = settings);
     }
     const sourceUrl = await importMetaResolve(
-      `@agoric/zoe/src/contracts/${contractPath}`,
+      `@agoric/zoe/src/contracts/${contractPath}.js`,
       import.meta.url,
     );
     const sourcePath = new URL(sourceUrl).pathname;

diff --git a/packages/swingset-runner/demo/zoeTests/sampleArgs b/packages/swingset-runner/demo/zoeTests/sampleArgs
@@ -6,8 +6,6 @@ coveredCallOk
 swapForOptionOk
 secondPriceAuctionOk
 atomicSwapOk
-simpleExchangeOk
-simpleExchangeNotifier
-autoswapOk
 sellTicketsOk
 otcDeskOk
+badTimer
diff --git a/packages/swingset-runner/demo/zoeTests/swingset.json b/packages/swingset-runner/demo/zoeTests/swingset.json
@@ -72,6 +72,10 @@
           "otcDeskOk": [
             [10000, 10000, 10000],
             [10000, 10000, 10000]
+          ],
+          "badTimer": [
+            [3, 0, 0],
+            [0, 0, 0]
           ]
         }
       }