refactor(SwingSet): unify vat-worker filenames

fixes Agoric#2202
dckc · Jan 21, 2021 · 08ccf41 · 08ccf41
1 parent 09153ed
commit 08ccf41
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -144,15 +144,15 @@ export async function makeSwingsetController(
     // TODO: after we move away from `-r esm` and use real ES6 modules, point
     // this at nodeWorkerSupervisor.js instead of the CJS intermediate
     const supercode = require.resolve(
-      './kernel/vatManager/nodeWorkerSupervisorCJS.js',
+      './kernel/vatManager/supervisor-nodeworker-cjs.js',
     );
     return new Worker(supercode);
   }
 
   // launch a worker in a subprocess (which runs Node.js)
   function startSubprocessWorkerNode() {
     const supercode = require.resolve(
-      './kernel/vatManager/subprocessSupervisor.js',
+      './kernel/vatManager/supervisor-subprocess-node.js',
     );
     return startSubprocessWorker(process.execPath, ['-r', 'esm', supercode]);
   }

diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vatManager/factory.js
@@ -1,8 +1,8 @@
 import { assert } from '@agoric/assert';
 import { assertKnownOptions } from '../../assertOptions';
-import { makeLocalVatManagerFactory } from './localVatManager';
-import { makeNodeWorkerVatManagerFactory } from './nodeWorker';
-import { makeNodeSubprocessFactory } from './worker-subprocess-node';
+import { makeLocalVatManagerFactory } from './manager-local';
+import { makeNodeWorkerVatManagerFactory } from './manager-nodeworker';
+import { makeNodeSubprocessFactory } from './manager-subprocess-node';
 
 export function makeVatManagerFactory({
   allVatPowers,

diff --git a/.../src/kernel/vatManager/localVatManager.js → ...et/src/kernel/vatManager/manager-local.js b/.../src/kernel/vatManager/localVatManager.js → ...et/src/kernel/vatManager/manager-local.js
diff --git a/...ngSet/src/kernel/vatManager/nodeWorker.js → ...c/kernel/vatManager/manager-nodeworker.js b/...ngSet/src/kernel/vatManager/nodeWorker.js → ...c/kernel/vatManager/manager-nodeworker.js
diff --git a/...rnel/vatManager/worker-subprocess-node.js → ...nel/vatManager/manager-subprocess-node.js b/...rnel/vatManager/worker-subprocess-node.js → ...nel/vatManager/manager-subprocess-node.js
diff --git a/...nel/vatManager/nodeWorkerSupervisorCJS.js → ...l/vatManager/supervisor-nodeworker-cjs.js b/...nel/vatManager/nodeWorkerSupervisorCJS.js → ...l/vatManager/supervisor-nodeworker-cjs.js
@@ -9,4 +9,4 @@
 
 // eslint-disable-next-line no-global-assign
 require = require('esm')(module);
-module.exports = require('./nodeWorkerSupervisor');
+module.exports = require('./supervisor-nodeworker');
diff --git a/...kernel/vatManager/nodeWorkerSupervisor.js → ...ernel/vatManager/supervisor-nodeworker.js b/...kernel/vatManager/nodeWorkerSupervisor.js → ...ernel/vatManager/supervisor-nodeworker.js
diff --git a/...kernel/vatManager/subprocessSupervisor.js → .../vatManager/supervisor-subprocess-node.js b/...kernel/vatManager/subprocessSupervisor.js → .../vatManager/supervisor-subprocess-node.js