From cc1d3c5604cf848a69ef55e61662c6094d5ff341 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Thu, 22 Jul 2021 00:51:15 -0700
Subject: [PATCH] fix(swingset-runner): remove --meter controls

Now that dynamic vats require a Meter object in the `meter:` option, rather
than just a `metered:` boolean flag, the swingset-runniner `--meter` option
doesn't work anymore. I'm removing it to allow the test to keep passing.
Eventually it might be interesting to improve the CLI arguments to create and
provide a Meter, but the need for user-level code to supervise and refill it
makes that non-trivial.
---
 packages/swingset-runner/src/main.js         | 19 -------------------
 packages/swingset-runner/src/vat-launcher.js |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/packages/swingset-runner/src/main.js b/packages/swingset-runner/src/main.js
index c3c03080f43..808ca5281cf 100644
--- a/packages/swingset-runner/src/main.js
+++ b/packages/swingset-runner/src/main.js
@@ -74,8 +74,6 @@ FLAGS may be:
   --statsfile FILE - output performance stats to FILE as a JSON object
   --benchmark N    - perform an N round benchmark after the initial run
   --indirect       - launch swingset from a vat instead of launching directly
-  --globalmetering - install metering on global objects
-  --meter          - run metered vats (implies --globalmetering and --indirect)
   --config FILE    - read swingset config from FILE instead of inferring it
 
 CMD is one of:
@@ -175,8 +173,6 @@ export async function main() {
   let dumpTag = 't';
   let rawMode = false;
   let shouldPrintStats = false;
-  let globalMeteringActive = false;
-  let meterVats = false;
   let launchIndirectly = false;
   let benchmarkRounds = 0;
   let configPath = null;
@@ -267,14 +263,6 @@ export async function main() {
       case '--statsfile':
         statsFile = argv.shift();
         break;
-      case '--globalmetering':
-        globalMeteringActive = true;
-        break;
-      case '--meter':
-        meterVats = true;
-        globalMeteringActive = true;
-        launchIndirectly = true;
-        break;
       case '--indirect':
         launchIndirectly = true;
         break;
@@ -309,10 +297,6 @@ export async function main() {
     process.exit(0);
   }
 
-  if (globalMeteringActive) {
-    log('global metering is active');
-  }
-
   if (forceGC) {
     if (!logMem) {
       log('Warning: --forcegc without --logmem may be a mistake');
@@ -382,9 +366,6 @@ export async function main() {
     default:
       fail(`invalid database mode ${dbMode}`, true);
   }
-  if (config.bootstrap) {
-    config.vats[config.bootstrap].parameters.metered = meterVats;
-  }
   const runtimeOptions = {};
   if (verbose) {
     runtimeOptions.verbose = true;
diff --git a/packages/swingset-runner/src/vat-launcher.js b/packages/swingset-runner/src/vat-launcher.js
index 6d3f2c5e35a..f849292c65a 100644
--- a/packages/swingset-runner/src/vat-launcher.js
+++ b/packages/swingset-runner/src/vat-launcher.js
@@ -41,7 +41,7 @@ export function buildRootObject(_vatPowers, vatParameters) {
         // eslint-disable-next-line no-await-in-loop
         const vat = await E(vatMaker).createVatByName(
           bundleName,
-          { metered: vatParameters.metered, vatParameters: harden(subvatParameters) },
+          { vatParameters: harden(subvatParameters) },
         );
         vatRoots[vatName] = vat.root;
       }