Merge pull request #1244 from Agoric/stop-importing-harden

Stop importing harden
Agoric · Jul 2, 2020 · 54f67a7 · 54f67a7
2 parents 4eba39f + e94f4d3
commit 54f67a7
Show file tree

Hide file tree

Showing 327 changed files with 475 additions and 388 deletions.
diff --git a/packages/ERTP/package.json b/packages/ERTP/package.json
@@ -36,7 +36,6 @@
   "dependencies": {
     "@agoric/assert": "^0.0.8",
     "@agoric/eventual-send": "^0.9.3",
-    "@agoric/harden": "^0.0.8",
     "@agoric/import-manager": "^0.0.7",
     "@agoric/layer-cake": "^0.0.1",
     "@agoric/marshal": "^0.2.3",

diff --git a/packages/ERTP/src/amountMath.js b/packages/ERTP/src/amountMath.js
@@ -1,5 +1,6 @@
+/* global harden */
 // @ts-check
-import harden from '@agoric/harden';
+
 import { assert, details } from '@agoric/assert';
 
 import { mustBeComparable } from '@agoric/same-structure';

diff --git a/packages/ERTP/src/issuer.js b/packages/ERTP/src/issuer.js
@@ -1,7 +1,8 @@
 // Copyright (C) 2019 Agoric, under Apache License 2.0
+
+/* global harden */
 // @ts-check
 
-import harden from '@agoric/harden';
 import { assert, details } from '@agoric/assert';
 import makeStore from '@agoric/weak-store';
 import { isPromise } from '@agoric/produce-promise';

diff --git a/packages/ERTP/src/mathHelpers/natMathHelpers.js b/packages/ERTP/src/mathHelpers/natMathHelpers.js
@@ -1,5 +1,6 @@
+/* global harden */
+
 import Nat from '@agoric/nat';
-import harden from '@agoric/harden';
 
 // Fungible digital assets use the natMathHelpers to manage balances -
 // the operations are merely arithmetic on natural, non-negative

diff --git a/packages/ERTP/src/mathHelpers/setMathHelpers.js b/packages/ERTP/src/mathHelpers/setMathHelpers.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { passStyleOf } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';

diff --git a/packages/ERTP/src/mathHelpers/strSetMathHelpers.js b/packages/ERTP/src/mathHelpers/strSetMathHelpers.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { passStyleOf } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 

diff --git a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 import produceIssuer from '../../../src/issuer';
 

diff --git a/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js b/packages/ERTP/test/swingsetTests/splitPayments/vat-alice.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 function makeAliceMaker(E, log) {
   return harden({

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-setMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js b/packages/ERTP/test/unitTests/mathHelpers/test-strSetMathHelpers.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import makeAmountMath from '../../../src/amountMath';
 

diff --git a/packages/ERTP/test/unitTests/test-issuerObj.js b/packages/ERTP/test/unitTests/test-issuerObj.js
@@ -1,4 +1,5 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
+import '@agoric/install-ses';
 import test from 'tape-promise/tape';
 import { E } from '@agoric/eventual-send';
 

diff --git a/packages/ERTP/test/unitTests/test-mintObj.js b/packages/ERTP/test/unitTests/test-mintObj.js
@@ -1,6 +1,8 @@
+/* global harden */
 // eslint-disable-next-line import/no-extraneous-dependencies
+
+import '@agoric/install-ses';
 import { test } from 'tape-promise/tape';
-import harden from '@agoric/harden';
 
 import produceIssuer from '../../src/issuer';
 

diff --git a/packages/SwingSet/demo/encouragementBot/bootstrap.js b/packages/SwingSet/demo/encouragementBot/bootstrap.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 console.log(`=> loading bootstrap.js`);
 

diff --git a/packages/SwingSet/demo/encouragementBot/vat-bot.js b/packages/SwingSet/demo/encouragementBot/vat-bot.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 export default function setup(syscall, state, helpers) {
   function log(what) {

diff --git a/packages/SwingSet/demo/encouragementBot/vat-user.js b/packages/SwingSet/demo/encouragementBot/vat-user.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 export default function setup(syscall, state, helpers) {
   function log(what) {

diff --git a/packages/SwingSet/demo/encouragementBotComms/bootstrap.js b/packages/SwingSet/demo/encouragementBotComms/bootstrap.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { E } from '@agoric/eventual-send';
 
 console.log(`=> loading bootstrap.js`);

diff --git a/packages/SwingSet/demo/encouragementBotComms/vat-bot.js b/packages/SwingSet/demo/encouragementBotComms/vat-bot.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 export default function setup(syscall, state, helpers) {
   function log(what) {

diff --git a/packages/SwingSet/demo/encouragementBotComms/vat-user.js b/packages/SwingSet/demo/encouragementBotComms/vat-user.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { E } from '@agoric/eventual-send';
 
 export default function setup(syscall, state, helpers) {

diff --git a/packages/SwingSet/demo/encouragementBotCommsWavyDot/bootstrap.js b/packages/SwingSet/demo/encouragementBotCommsWavyDot/bootstrap.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // This javascript source file uses the "tildot" syntax (foo~.bar()) for
 // eventual sends.

diff --git a/packages/SwingSet/demo/encouragementBotCommsWavyDot/vat-bot.js b/packages/SwingSet/demo/encouragementBotCommsWavyDot/vat-bot.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // This javascript source file uses the "tildot" syntax (foo~.bar()) for
 // eventual sends.

diff --git a/packages/SwingSet/demo/encouragementBotCommsWavyDot/vat-user.js b/packages/SwingSet/demo/encouragementBotCommsWavyDot/vat-user.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // This javascript source file uses the "tildot" syntax (foo~.bar()) for
 // eventual sends.

diff --git a/packages/SwingSet/package.json b/packages/SwingSet/package.json
@@ -32,7 +32,6 @@
     "@agoric/babel-parser": "^7.6.4",
     "@agoric/bundle-source": "^1.1.6",
     "@agoric/eventual-send": "^0.9.3",
-    "@agoric/harden": "^0.0.8",
     "@agoric/import-bundle": "^0.0.8",
     "@agoric/marshal": "^0.2.3",
     "@agoric/nat": "^2.0.1",

diff --git a/packages/SwingSet/src/blockBuffer.js b/packages/SwingSet/src/blockBuffer.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 // buildBlockBuffer() is used by all hosts, to wrap whatever hostDB they use
 

diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller.js
@@ -1,5 +1,5 @@
-// eslint-disable-next-line no-redeclare
 /* global Compartment harden */
+
 import fs from 'fs';
 import path from 'path';
 import re2 from 're2';
@@ -168,11 +168,7 @@ export async function buildVatController(config, argv = []) {
   // import anything outside their bundle.
 
   function vatRequire(what) {
-    if (what === '@agoric/harden') {
-      return harden;
-    } else {
-      throw Error(`vatRequire unprepared to satisfy require(${what})`);
-    }
+    throw Error(`vatRequire unprepared to satisfy require(${what})`);
   }
 
   const vatEndowments = harden({

diff --git a/packages/SwingSet/src/devices/bridge-src.js b/packages/SwingSet/src/devices/bridge-src.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 function sanitize(data) {
   // TODO: Use @agoric/marshal:pureCopy when it exists.

diff --git a/packages/SwingSet/src/devices/command-src.js b/packages/SwingSet/src/devices/command-src.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import Nat from '@agoric/nat';
 
 export default function setup(syscall, state, helpers, endowments) {

diff --git a/packages/SwingSet/src/devices/loopbox-src.js b/packages/SwingSet/src/devices/loopbox-src.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 export default function setup(syscall, state, helpers, _endowments) {
   const inboundHandlers = harden(new Map());

diff --git a/packages/SwingSet/src/devices/mailbox-src.js b/packages/SwingSet/src/devices/mailbox-src.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import Nat from '@agoric/nat';
 
 export default function setup(syscall, state, helpers, endowments) {

diff --git a/packages/SwingSet/src/devices/mailbox.js b/packages/SwingSet/src/devices/mailbox.js
@@ -1,3 +1,5 @@
+/* global harden */
+
 /*
   The 'mailbox' device helps manage bidirectional communication with a number
   of 'peers'. Each peer is identified with a string. We exchange ordered
@@ -64,7 +66,6 @@
 
 */
 
-import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 
 // This Map-based mailboxState object is a good starting point, but we may

diff --git a/packages/SwingSet/src/devices/timer-src.js b/packages/SwingSet/src/devices/timer-src.js
@@ -1,3 +1,5 @@
+/* global harden */
+
 /**
  * A Timer device that provides a capability that can be used to schedule wake()
  * calls at particular times. The simpler form is a handler object with a wake()
@@ -24,7 +26,6 @@
  * expose only capabilities that don't reveal them.
  */
 
-import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { assert, details } from '@agoric/assert';
 

diff --git a/packages/SwingSet/src/hostStorage.js b/packages/SwingSet/src/hostStorage.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { initSwingStore } from '@agoric/swing-store-simple';
 
 /*

diff --git a/packages/SwingSet/src/kernel/deviceManager.js b/packages/SwingSet/src/kernel/deviceManager.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { assert, details } from '@agoric/assert';
 import { insistKernelType } from './parseKernelSlots';
 import { insistVatType, parseVatSlot } from '../parseVatSlots';

diff --git a/packages/SwingSet/src/kernel/deviceSlots.js b/packages/SwingSet/src/kernel/deviceSlots.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { mustPassByPresence, makeMarshal } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 import { insistVatType, makeVatSlot, parseVatSlot } from '../parseVatSlots';

diff --git a/packages/SwingSet/src/kernel/id.js b/packages/SwingSet/src/kernel/id.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import Nat from '@agoric/nat';
 
 // Vats are identified by an integer index, which (for typechecking purposes)

diff --git a/packages/SwingSet/src/kernel/kernel.js b/packages/SwingSet/src/kernel/kernel.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { makeMarshal, Remotable, getInterfaceOf } from '@agoric/marshal';
 import { assert, details } from '@agoric/assert';
 import { makeMeter } from '@agoric/transform-metering';

diff --git a/packages/SwingSet/src/kernel/liveSlots.js b/packages/SwingSet/src/kernel/liveSlots.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { E, HandledPromise } from '@agoric/eventual-send';
 import {
   QCLASS,

diff --git a/packages/SwingSet/src/kernel/state/deviceKeeper.js b/packages/SwingSet/src/kernel/state/deviceKeeper.js
@@ -1,8 +1,9 @@
+/* global harden */
+
 /**
  * Kernel's keeper of persistent state for a device.
  */
 
-import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { assert, details } from '@agoric/assert';
 import { parseKernelSlot } from '../parseKernelSlots';

diff --git a/packages/SwingSet/src/kernel/state/kernelKeeper.js b/packages/SwingSet/src/kernel/state/kernelKeeper.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import Nat from '@agoric/nat';
 import { assert, details } from '@agoric/assert';
 import { initializeVatState, makeVatKeeper } from './vatKeeper';

diff --git a/packages/SwingSet/src/kernel/state/storageWrapper.js b/packages/SwingSet/src/kernel/state/storageWrapper.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { insistStorageAPI } from '../../storageAPI';
 
 // We manage a host-realm Storage object with a has/getKeys/get/set/del API.

diff --git a/packages/SwingSet/src/kernel/state/vatKeeper.js b/packages/SwingSet/src/kernel/state/vatKeeper.js
@@ -1,8 +1,9 @@
+/* global harden */
+
 /**
  * Kernel's keeper of persistent state for a vat.
  */
 
-import harden from '@agoric/harden';
 import Nat from '@agoric/nat';
 import { assert, details } from '@agoric/assert';
 import { parseKernelSlot } from '../parseKernelSlots';

diff --git a/packages/SwingSet/src/kernel/vatAdmin/vatAdmin-src.js b/packages/SwingSet/src/kernel/vatAdmin/vatAdmin-src.js
@@ -1,4 +1,4 @@
-import harden from '@agoric/harden';
+/* global harden */
 
 /**
  * A Vat management device that provides a capability that can be used to

diff --git a/packages/SwingSet/src/kernel/vatAdmin/vatAdminWrapper.js b/packages/SwingSet/src/kernel/vatAdmin/vatAdminWrapper.js
@@ -1,11 +1,12 @@
+/* global harden */
+
 /**
  * The VatAdmin wrapper vat.
  *
  * This is the only vat that has a direct pointer to the vatAdmin device, so it
  * must ensure that only data goes in and out. It's also responsible for turning
  * device affordances into objects that can be used by code in other vats.
  */
-import harden from '@agoric/harden';
 import { producePromise } from '@agoric/produce-promise';
 
 function producePRR() {

diff --git a/packages/SwingSet/src/kernel/vatManager.js b/packages/SwingSet/src/kernel/vatManager.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { assert, details } from '@agoric/assert';
 import djson from './djson';
 import { insistKernelType, parseKernelSlot } from './parseKernelSlots';

diff --git a/packages/SwingSet/src/vats/comms/controller.js b/packages/SwingSet/src/vats/comms/controller.js
@@ -1,5 +1,6 @@
+/* global harden */
+
 import Nat from '@agoric/nat';
-import harden from '@agoric/harden';
 import { assert, details } from '@agoric/assert';
 import { addRemote } from './remote';
 import { addEgress, addIngress } from './clist';

diff --git a/packages/SwingSet/src/vats/comms/dispatch.js b/packages/SwingSet/src/vats/comms/dispatch.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { assert, details } from '@agoric/assert';
 import { makeVatSlot } from '../../parseVatSlots';
 import { getRemote } from './remote';

diff --git a/packages/SwingSet/src/vats/comms/inbound.js b/packages/SwingSet/src/vats/comms/inbound.js
@@ -1,4 +1,5 @@
-import harden from '@agoric/harden';
+/* global harden */
+
 import { assert, details } from '@agoric/assert';
 import { insistRemoteType } from './parseRemoteSlot';
 import { getInbound, mapInbound, mapInboundResult } from './clist';

diff --git a/packages/SwingSet/src/vats/network/network.js b/packages/SwingSet/src/vats/network/network.js
@@ -1,12 +1,11 @@
+/* global harden */
 // @ts-check
+
 import makeStore from '@agoric/store';
-import rawHarden from '@agoric/harden';
 import { E as defaultE } from '@agoric/eventual-send';
 import { producePromise } from '@agoric/produce-promise';
 import { toBytes } from './bytes';
 
-const harden = /** @type {<T>(x: T) => T} */ (rawHarden);
-
 /**
  * Compatibility note: this must match what our peers use,
  * so don't change it casually.