From 3714ed9fc5b62b39b2c04e7b24bb6e985268036a Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 21 Apr 2021 19:53:06 -0700
Subject: [PATCH] fix(swingset): stop rejecting metered=true for xs-worker

Previously, any vat which wanted metering was forced to use worker=local,
even if they asked for something different. And worker=xs asserted that
metering was not requested. This removes both checks.

refs #2868
---
 packages/SwingSet/src/kernel/vatManager/factory.js            | 4 ++--
 .../src/kernel/vatManager/manager-subprocess-xsnap.js         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
index f22e48f4c0b..b9367ae0bfc 100644
--- a/packages/SwingSet/src/kernel/vatManager/factory.js
+++ b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -87,7 +87,7 @@ export function makeVatManagerFactory({
       enableSetup,
     } = managerOptions;
 
-    if (metered && managerType !== 'local') {
+    if (metered && managerType !== 'local' && managerType !== 'xs-worker') {
       console.warn(
         `TODO: support metered with ${managerType}; using local as work-around`,
       );
@@ -97,7 +97,7 @@ export function makeVatManagerFactory({
         `TODO: stop using setup() with ${managerType}; using local as work-around`,
       );
     }
-    if (managerType === 'local' || metered || enableSetup) {
+    if (managerType === 'local' || enableSetup) {
       if (setup) {
         return localFactory.createFromSetup(
           vatID,
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
index 9efb2af4b91..2b3d0006086 100644
--- a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
+++ b/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
@@ -53,7 +53,6 @@ export function makeXsSubprocessFactory({
       enableDisavow,
       name,
     } = managerOptions;
-    assert(!managerOptions.metered, 'xs-worker: metered not supported yet');
     assert(
       !managerOptions.enableSetup,
       'xs-worker: enableSetup not supported at all',