move parseVatSlots.js out of src/vats/ up to src/

src/kernel/deviceManager.js

@@ -1,7 +1,7 @@
 import harden from '@agoric/harden';
 import { insist } from '../insist';
 import { insistKernelType } from './parseKernelSlots';
-import { insistVatType, parseVatSlot } from '../vats/parseVatSlots';
+import { insistVatType, parseVatSlot } from '../parseVatSlots';
 
 export default function makeDeviceManager(
   deviceName,

src/kernel/deviceSlots.js

@@ -2,11 +2,7 @@ import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { QCLASS, mustPassByPresence, makeMarshal } from '@agoric/marshal';
 import { insist } from '../insist';
-import {
-  insistVatType,
-  makeVatSlot,
-  parseVatSlot,
-} from '../vats/parseVatSlots';
+import { insistVatType, makeVatSlot, parseVatSlot } from '../parseVatSlots';
 
 // 'makeDeviceSlots' is a subset of makeLiveSlots, for device code
 

src/kernel/kernel.js

@@ -8,7 +8,7 @@ import makeVatManager from './vatManager';
 import makeDeviceManager from './deviceManager';
 import makeKernelKeeper from './state/kernelKeeper';
 import { insistKernelType, parseKernelSlot } from './parseKernelSlots';
-import { makeVatSlot } from '../vats/parseVatSlots';
+import { makeVatSlot } from '../parseVatSlots';
 import { insist } from '../insist';
 
 function abbreviateReviver(_, arg) {

src/kernel/liveSlots.js

@@ -2,11 +2,7 @@ import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { QCLASS, mustPassByPresence, makeMarshal } from '@agoric/marshal';
 import { insist } from '../insist';
-import {
-  insistVatType,
-  makeVatSlot,
-  parseVatSlot,
-} from '../vats/parseVatSlots';
+import { insistVatType, makeVatSlot, parseVatSlot } from '../parseVatSlots';
 
 // 'makeLiveSlots' is a dispatcher which uses javascript Maps to keep track
 // of local objects which have been exported. These cannot be persisted

src/kernel/state/deviceKeeper.js

@@ -1,7 +1,7 @@
 import harden from '@agoric/harden';
 import { insist } from '../../insist';
 import { parseKernelSlot } from '../parseKernelSlots';
-import { makeVatSlot, parseVatSlot } from '../../vats/parseVatSlots';
+import { makeVatSlot, parseVatSlot } from '../../parseVatSlots';
 
 // makeVatKeeper is a pure function: all state is kept in the argument object
 

src/kernel/state/vatKeeper.js

@@ -1,7 +1,7 @@
 import harden from '@agoric/harden';
 import { insist } from '../../insist';
 import { parseKernelSlot } from '../parseKernelSlots';
-import { makeVatSlot, parseVatSlot } from '../../vats/parseVatSlots';
+import { makeVatSlot, parseVatSlot } from '../../parseVatSlots';
 
 // makeVatKeeper is a pure function: all state is kept in the argument object
 

src/kernel/vatManager.js

@@ -2,7 +2,7 @@ import harden from '@agoric/harden';
 import djson from './djson';
 import { insist } from '../insist';
 import { insistKernelType, parseKernelSlot } from './parseKernelSlots';
-import { insistVatType, parseVatSlot } from '../vats/parseVatSlots';
+import { insistVatType, parseVatSlot } from '../parseVatSlots';
 
 export default function makeVatManager(
   vatID,

src/vats/parseVatSlots.js → src/parseVatSlots.js

@@ -1,5 +1,5 @@
 import Nat from '@agoric/nat';
-import { insist } from '../insist';
+import { insist } from './insist';
 
 // Object/promise references (in vats) contain a three-tuple of (type,
 // allocator flag, index). The 'ownership' flag is expressed as a sign: "-"

src/vats/comms/clist.js

@@ -1,5 +1,5 @@
 import Nat from '@agoric/nat';
-import { makeVatSlot, parseVatSlot, insistVatType } from '../parseVatSlots';
+import { makeVatSlot, parseVatSlot, insistVatType } from '../../parseVatSlots';
 import {
   flipRemoteSlot,
   insistRemoteType,

src/vats/comms/dispatch.js

@@ -1,5 +1,5 @@
 import harden from '@agoric/harden';
-import { makeVatSlot } from '../parseVatSlots';
+import { makeVatSlot } from '../../parseVatSlots';
 import { getRemote } from './remote';
 import { makeState } from './state';
 import { deliverToRemote, resolvePromiseToRemote } from './outbound';

src/vats/comms/outbound.js

@@ -1,4 +1,4 @@
-import { insistVatType } from '../parseVatSlots';
+import { insistVatType } from '../../parseVatSlots';
 import { insistRemoteType } from './parseRemoteSlot';
 import { getOutbound, mapOutbound, mapOutboundResult } from './clist';
 import {

src/vats/comms/remote.js

@@ -1,5 +1,5 @@
 import Nat from '@agoric/nat';
-import { makeVatSlot, insistVatType } from '../parseVatSlots';
+import { makeVatSlot, insistVatType } from '../../parseVatSlots';
 import { insist } from '../../insist';
 
 function makeRemoteID(index) {

src/vats/comms/state.js

@@ -1,5 +1,5 @@
 import { insist } from '../../insist';
-import { makeVatSlot } from '../parseVatSlots';
+import { makeVatSlot } from '../../parseVatSlots';
 
 export function makeState() {
   const state = {

test/test-kernel.js

@@ -2,7 +2,7 @@
 /* global setImmediate */
 import { test } from 'tape-promise/tape';
 import buildKernel from '../src/kernel/index';
-import { makeVatSlot } from '../src/vats/parseVatSlots';
+import { makeVatSlot } from '../src/parseVatSlots';
 import { checkKT } from './util';
 
 function checkPromises(t, kernel, expected) {